From 7152401783578b56343f578b4ec920998660de33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 9 Nov 2016 06:54:17 +0100 Subject: New upstream version 0.25.0.1 --- ChangeLog | 12 +- Makefile.am | 3 +- Makefile.in | 248 ++++++++++----------- configure | 22 +- configure.ac | 2 +- plugins/common/RESTSupport.c | 2 +- plugins/common/Resources.c | 2 +- plugins/common/WebAuthenticationPane.c | 2 +- plugins/shotwell-data-imports/FSpotDatabase.c | 2 +- .../shotwell-data-imports/FSpotDatabaseBehavior.c | 2 +- plugins/shotwell-data-imports/FSpotDatabaseTable.c | 2 +- plugins/shotwell-data-imports/FSpotImporter.c | 2 +- plugins/shotwell-data-imports/FSpotMetaTable.c | 2 +- .../shotwell-data-imports/FSpotPhotoTagsTable.c | 2 +- .../FSpotPhotoVersionsTable.c | 2 +- plugins/shotwell-data-imports/FSpotPhotosTable.c | 2 +- plugins/shotwell-data-imports/FSpotRollsTable.c | 2 +- plugins/shotwell-data-imports/FSpotTableBehavior.c | 2 +- plugins/shotwell-data-imports/FSpotTagsTable.c | 2 +- plugins/shotwell-data-imports/SqliteSupport.c | 2 +- plugins/shotwell-data-imports/VersionNumber.c | 2 +- .../shotwell-data-imports/shotwell-data-imports.c | 2 +- plugins/shotwell-plugin-common.h | 2 +- plugins/shotwell-plugin-common.vapi | 2 +- plugins/shotwell-plugin-dev-1.0.h | 2 +- plugins/shotwell-plugin-dev-1.0.vapi | 2 +- .../shotwell-publishing-extras/GalleryConnector.c | 2 +- .../shotwell-publishing-extras/RajcePublishing.c | 2 +- .../shotwell-publishing-extras/TumblrPublishing.c | 2 +- .../shotwell-publishing-extras/YandexPublishing.c | 2 +- .../shotwell-publishing-extras.c | 2 +- plugins/shotwell-publishing/FacebookPublishing.c | 2 +- plugins/shotwell-publishing/FlickrPublishing.c | 2 +- plugins/shotwell-publishing/PicasaPublishing.c | 2 +- plugins/shotwell-publishing/PiwigoPublishing.c | 2 +- plugins/shotwell-publishing/YouTubePublishing.c | 2 +- plugins/shotwell-publishing/shotwell-publishing.c | 2 +- plugins/shotwell-transitions/BlindsEffect.c | 2 +- plugins/shotwell-transitions/ChessEffect.c | 2 +- plugins/shotwell-transitions/CircleEffect.c | 2 +- plugins/shotwell-transitions/CirclesEffect.c | 2 +- plugins/shotwell-transitions/ClockEffect.c | 2 +- plugins/shotwell-transitions/CrumbleEffect.c | 2 +- plugins/shotwell-transitions/FadeEffect.c | 2 +- plugins/shotwell-transitions/SlideEffect.c | 2 +- plugins/shotwell-transitions/SquaresEffect.c | 2 +- plugins/shotwell-transitions/StripesEffect.c | 2 +- .../shotwell-transitions/shotwell-transitions.c | 2 +- po/shotwell.pot | 2 +- src/.unitize/_CameraInternals.c | 2 +- src/.unitize/_ConfigInternals.c | 2 +- src/.unitize/_CoreInternals.c | 2 +- src/.unitize/_DataImportsInternals.c | 2 +- src/.unitize/_DbInternals.c | 2 +- src/.unitize/_DirectInternals.c | 2 +- src/.unitize/_Direct_unitize_entry.c | 2 +- src/.unitize/_EditingToolsInternals.c | 2 +- src/.unitize/_EventsInternals.c | 2 +- src/.unitize/_FoldersInternals.c | 2 +- src/.unitize/_LibraryInternals.c | 2 +- src/.unitize/_Library_unitize_entry.c | 2 +- src/.unitize/_PhotosInternals.c | 2 +- src/.unitize/_PluginsInternals.c | 2 +- src/.unitize/_PublishingInternals.c | 2 +- src/.unitize/_SearchesInternals.c | 2 +- src/.unitize/_SidebarInternals.c | 2 +- src/.unitize/_SlideshowInternals.c | 2 +- src/.unitize/_TagsInternals.c | 2 +- src/.unitize/_ThreadsInternals.c | 2 +- src/.unitize/_UnitInternals.c | 2 +- src/.unitize/_UtilInternals.c | 2 +- src/AppDirs.c | 2 +- src/AppWindow.c | 2 +- src/Application.c | 2 +- src/BatchImport.c | 8 +- src/Box.c | 2 +- src/CheckerboardLayout.c | 2 +- src/CollectionPage.c | 2 +- src/ColorTransformation.c | 2 +- src/CommandManager.c | 2 +- src/Commands.c | 2 +- src/CustomComponents.c | 2 +- src/Debug.c | 2 +- src/DesktopIntegration.c | 2 +- src/Dialogs.c | 8 +- src/Dimensions.c | 2 +- src/DirectoryMonitor.c | 54 ++--- src/Event.c | 2 +- src/Exporter.c | 2 +- src/International.c | 2 +- src/LibraryFiles.c | 2 +- src/LibraryMonitor.c | 16 +- src/MediaDataRepresentation.c | 10 +- src/MediaInterfaces.c | 2 +- src/MediaMetadata.c | 2 +- src/MediaMonitor.c | 4 +- src/MediaPage.c | 2 +- src/MediaViewTracker.c | 2 +- src/MetadataWriter.c | 2 +- src/NaturalCollate.c | 2 +- src/Orientation.c | 2 +- src/Page.c | 2 +- src/Photo.c | 18 +- src/PhotoMonitor.c | 6 +- src/PhotoPage.c | 2 +- src/PixbufCache.c | 6 +- src/Printing.c | 2 +- src/Properties.c | 2 +- src/Resources.c | 8 +- src/Screensaver.c | 2 +- src/SearchFilter.c | 2 +- src/SlideshowPage.c | 2 +- src/SortedList.c | 6 +- src/Tag.c | 2 +- src/Thumbnail.c | 2 +- src/ThumbnailCache.c | 4 +- src/TimedQueue.c | 2 +- src/Tombstone.c | 4 +- src/UnityProgressBar.c | 2 +- src/Upgrades.c | 2 +- src/VideoMetadata.c | 2 +- src/VideoMonitor.c | 2 +- src/VideoSupport.c | 2 +- src/camera/Branch.c | 2 +- src/camera/Camera.c | 2 +- src/camera/CameraTable.c | 2 +- src/camera/GPhoto.c | 2 +- src/camera/ImportPage.c | 2 +- src/config/Config.c | 2 +- src/config/ConfigurationInterfaces.c | 2 +- src/config/GSettingsEngine.c | 2 +- src/core/Alteration.c | 2 +- src/core/ContainerSourceCollection.c | 2 +- src/core/Core.c | 2 +- src/core/DataCollection.c | 2 +- src/core/DataObject.c | 2 +- src/core/DataSet.c | 2 +- src/core/DataSource.c | 2 +- src/core/DataSourceTypes.c | 2 +- src/core/DataView.c | 2 +- src/core/DataViewTypes.c | 2 +- src/core/DatabaseSourceCollection.c | 2 +- src/core/SourceCollection.c | 2 +- src/core/SourceHoldingTank.c | 2 +- src/core/SourceInterfaces.c | 2 +- src/core/Tracker.c | 2 +- src/core/ViewCollection.c | 2 +- src/core/util.c | 2 +- src/data_imports/DataImportJob.c | 2 +- src/data_imports/DataImportSource.c | 2 +- src/data_imports/DataImports.c | 2 +- src/data_imports/DataImportsPluginHost.c | 2 +- src/data_imports/DataImportsUI.c | 2 +- src/db/DatabaseTable.c | 2 +- src/db/Db.c | 2 +- src/db/EventTable.c | 2 +- src/db/PhotoTable.c | 2 +- src/db/SavedSearchDBTable.c | 2 +- src/db/TagTable.c | 2 +- src/db/TombstoneTable.c | 2 +- src/db/VersionTable.c | 2 +- src/db/VideoTable.c | 2 +- src/direct/Direct.c | 2 +- src/direct/DirectPhoto.c | 4 +- src/direct/DirectPhotoPage.c | 2 +- src/direct/DirectView.c | 2 +- src/direct/DirectWindow.c | 2 +- src/editing_tools/EditingTools.c | 6 +- src/editing_tools/StraightenTool.c | 2 +- src/events/Branch.c | 2 +- src/events/EventDirectoryItem.c | 2 +- src/events/EventPage.c | 2 +- src/events/Events.c | 2 +- src/events/EventsDirectoryPage.c | 2 +- src/folders/Branch.c | 8 +- src/folders/Folders.c | 2 +- src/folders/Page.c | 2 +- src/library/Branch.c | 2 +- src/library/FlaggedPage.c | 2 +- src/library/FlaggedSidebarEntry.c | 2 +- src/library/ImportQueuePage.c | 2 +- src/library/ImportQueueSidebarEntry.c | 2 +- src/library/LastImportPage.c | 2 +- src/library/LastImportSidebarEntry.c | 2 +- src/library/Library.c | 2 +- src/library/LibraryWindow.c | 2 +- src/library/OfflinePage.c | 2 +- src/library/OfflineSidebarEntry.c | 2 +- src/library/TrashPage.c | 2 +- src/library/TrashSidebarEntry.c | 2 +- src/main.c | 2 +- src/photos/BmpSupport.c | 2 +- src/photos/GRaw.c | 2 +- src/photos/GdkSupport.c | 2 +- src/photos/JfifSupport.c | 2 +- src/photos/PhotoFileAdapter.c | 2 +- src/photos/PhotoFileFormat.c | 2 +- src/photos/PhotoFileSniffer.c | 2 +- src/photos/PhotoMetadata.c | 2 +- src/photos/Photos.c | 2 +- src/photos/PngSupport.c | 2 +- src/photos/RawSupport.c | 2 +- src/photos/TiffSupport.c | 2 +- src/plugins/DataImportsInterfaces.c | 2 +- src/plugins/ManifestWidget.c | 6 +- src/plugins/Plugins.c | 2 +- src/plugins/PublishingInterfaces.c | 2 +- src/plugins/SpitInterfaces.c | 2 +- src/plugins/StandardHostInterface.c | 2 +- src/plugins/TransitionsInterfaces.c | 10 +- src/publishing/APIGlue.c | 2 +- src/publishing/Publishing.c | 2 +- src/publishing/PublishingPluginHost.c | 2 +- src/publishing/PublishingUI.c | 4 +- src/searches/Branch.c | 2 +- src/searches/SavedSearchDialog.c | 2 +- src/searches/SavedSearchPage.c | 2 +- src/searches/SearchBoolean.c | 2 +- src/searches/Searches.c | 2 +- src/sidebar/Branch.c | 2 +- src/sidebar/Entry.c | 2 +- src/sidebar/Sidebar.c | 2 +- src/sidebar/Tree.c | 2 +- src/sidebar/common.c | 2 +- src/slideshow/Slideshow.c | 2 +- src/slideshow/TransitionEffects.c | 2 +- src/tags/Branch.c | 2 +- src/tags/HierarchicalTagIndex.c | 2 +- src/tags/HierarchicalTagUtilities.c | 2 +- src/tags/TagPage.c | 2 +- src/tags/Tags.c | 2 +- src/threads/BackgroundJob.c | 2 +- src/threads/Semaphore.c | 2 +- src/threads/Threads.c | 2 +- src/threads/Workers.c | 2 +- src/unit/Unit.c | 2 +- src/util/KeyValueMap.c | 2 +- src/util/Util.c | 2 +- src/util/file.c | 2 +- src/util/image.c | 2 +- src/util/misc.c | 2 +- src/util/string.c | 2 +- src/util/system.c | 2 +- src/util/ui.c | 2 +- thumbnailer/shotwell-video-thumbnailer.c | 2 +- vapi/misc.vapi | 8 + 246 files changed, 473 insertions(+), 454 deletions(-) create mode 100644 vapi/misc.vapi diff --git a/ChangeLog b/ChangeLog index 2186070..bee37e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -commit 0a348fe98b77bf17b4cbe8a257eecffc966acbd7 +commit 8cc28654affe568f156bc74a20fb4959160ac872 Author: Jens Georg Date: Mon Oct 24 20:09:08 2016 +0200 @@ -9,6 +9,16 @@ Date: Mon Oct 24 20:09:08 2016 +0200 M NEWS M debian/changelog +commit cec1eee8af5a79d2091c9b9b6bc26fab0593105d +Author: Jens Georg +Date: Mon Oct 24 21:07:33 2016 +0200 + + Distribute SSL ui panel + + Signed-off-by: Jens Georg + +M publish.am + commit ece15b26e968e76a9165ba4fdacfcde5a425fc38 Author: Jens Georg Date: Sun Oct 16 22:20:14 2016 +0200 diff --git a/Makefile.am b/Makefile.am index e47126b..4c7d9d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,4 +151,5 @@ dist_noinst_DATA += \ vapi/libgphoto2.vapi \ vapi/libraw.vapi \ vapi/unity.deps \ - vapi/unity.vapi + vapi/unity.vapi \ + vapi/misc.vapi diff --git a/Makefile.in b/Makefile.in index a980264..ee358be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -605,7 +605,7 @@ am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \ plugins/shotwell-plugin-dev-1.0.h \ plugins/shotwell-plugin-common.h vapi/gphoto.h \ vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \ - vapi/unity.deps vapi/unity.vapi + vapi/unity.deps vapi/unity.vapi vapi/misc.vapi DATA = $(dist_noinst_DATA) $(dist_plugin_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -1139,7 +1139,7 @@ dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \ plugins/shotwell-plugin-dev-1.0.h \ plugins/shotwell-plugin-common.h vapi/gphoto.h \ vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \ - vapi/unity.deps vapi/unity.vapi + vapi/unity.deps vapi/unity.vapi vapi/misc.vapi MOSTLYCLEANFILES = $(NULL) plugins/shotwell-publishing/resource.c \ $(am__append_5) plugins/shotwell-transitions/resource.c \ plugins/shotwell-data-imports/resource.c @@ -5921,6 +5921,15 @@ thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.ob @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='thumbnailer/shotwell-video-thumbnailer.c' object='thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj `if test -f 'thumbnailer/shotwell-video-thumbnailer.c'; then $(CYGPATH_W) 'thumbnailer/shotwell-video-thumbnailer.c'; else $(CYGPATH_W) '$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c'; fi` +$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \ + fi +$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala + $(AM_V_at)mv -f $@-t $@ $(srcdir)/src/unit/Unit.c: $(srcdir)/shotwell_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi @if test -f $@; then :; else \ @@ -6880,14 +6889,64 @@ $(srcdir)/shotwell_vala.stamp: src/unit/Unit.vala src/util/Util.vala src/util/fi $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(shotwell_VALAFLAGS) $(VALAFLAGS) -C src/unit/Unit.vala src/util/Util.vala src/util/file.vala src/util/image.vala src/util/misc.vala src/util/string.vala src/util/system.vala src/util/KeyValueMap.vala src/util/ui.vala src/threads/Threads.vala src/threads/Workers.vala src/threads/BackgroundJob.vala src/threads/Semaphore.vala src/db/Db.vala src/db/DatabaseTable.vala src/db/PhotoTable.vala src/db/EventTable.vala src/db/TagTable.vala src/db/TombstoneTable.vala src/db/VideoTable.vala src/db/VersionTable.vala src/db/SavedSearchDBTable.vala src/editing_tools/EditingTools.vala src/editing_tools/StraightenTool.vala src/slideshow/Slideshow.vala src/slideshow/TransitionEffects.vala src/photos/Photos.vala src/photos/PhotoFileAdapter.vala src/photos/PhotoFileFormat.vala src/photos/PhotoFileSniffer.vala src/photos/PhotoMetadata.vala src/photos/GRaw.vala src/photos/GdkSupport.vala src/photos/JfifSupport.vala src/photos/BmpSupport.vala src/photos/RawSupport.vala src/photos/PngSupport.vala src/photos/TiffSupport.vala src/plugins/Plugins.vala src/plugins/StandardHostInterface.vala src/plugins/ManifestWidget.vala src/publishing/Publishing.vala src/publishing/PublishingUI.vala src/publishing/PublishingPluginHost.vala src/publishing/APIGlue.vala src/library/Library.vala src/library/LibraryWindow.vala src/library/Branch.vala src/library/TrashSidebarEntry.vala src/library/OfflineSidebarEntry.vala src/library/FlaggedSidebarEntry.vala src/library/LastImportSidebarEntry.vala src/library/ImportQueueSidebarEntry.vala src/library/FlaggedPage.vala src/library/ImportQueuePage.vala src/library/LastImportPage.vala src/library/OfflinePage.vala src/library/TrashPage.vala src/direct/Direct.vala src/direct/DirectWindow.vala src/direct/DirectPhoto.vala src/direct/DirectPhotoPage.vala src/direct/DirectView.vala src/core/Core.vala src/core/DataCollection.vala src/core/DataSet.vala src/core/util.vala src/core/SourceCollection.vala src/core/SourceHoldingTank.vala src/core/DatabaseSourceCollection.vala src/core/ContainerSourceCollection.vala src/core/ViewCollection.vala src/core/DataObject.vala src/core/Alteration.vala src/core/DataSource.vala src/core/DataSourceTypes.vala src/core/DataView.vala src/core/DataViewTypes.vala src/core/Tracker.vala src/core/SourceInterfaces.vala src/sidebar/Sidebar.vala src/sidebar/Branch.vala src/sidebar/Entry.vala src/sidebar/Tree.vala src/sidebar/common.vala src/events/Events.vala src/events/Branch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/Branch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/Branch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/Branch.vala src/searches/SearchBoolean.vala src/searches/SavedSearchPage.vala src/searches/SavedSearchDialog.vala src/config/Config.vala src/config/ConfigurationInterfaces.vala src/config/GSettingsEngine.vala src/data_imports/DataImports.vala src/data_imports/DataImportsPluginHost.vala src/data_imports/DataImportsUI.vala src/data_imports/DataImportJob.vala src/data_imports/DataImportSource.vala src/folders/Folders.vala src/folders/Branch.vala src/folders/Page.vala src/main.vala src/AppWindow.vala src/CollectionPage.vala src/NaturalCollate.vala src/Thumbnail.vala src/ThumbnailCache.vala src/CheckerboardLayout.vala src/PhotoPage.vala src/Page.vala src/SortedList.vala src/Dimensions.vala src/Box.vala src/Photo.vala src/Orientation.vala src/BatchImport.vala src/Dialogs.vala src/Resources.vala src/Debug.vala src/ColorTransformation.vala src/Properties.vala src/CustomComponents.vala src/Event.vala src/International.vala src/AppDirs.vala src/PixbufCache.vala src/CommandManager.vala src/Commands.vala src/SlideshowPage.vala src/LibraryFiles.vala src/Printing.vala src/Tag.vala src/Screensaver.vala src/Exporter.vala src/DirectoryMonitor.vala src/LibraryMonitor.vala src/VideoSupport.vala src/Tombstone.vala src/MetadataWriter.vala src/Application.vala src/TimedQueue.vala src/MediaPage.vala src/MediaDataRepresentation.vala src/DesktopIntegration.vala src/MediaInterfaces.vala src/MediaMetadata.vala src/VideoMetadata.vala src/MediaMonitor.vala src/PhotoMonitor.vala src/VideoMonitor.vala src/SearchFilter.vala src/MediaViewTracker.vala src/UnityProgressBar.vala src/Upgrades.vala src/.unitize/_UnitInternals.vala src/.unitize/_UtilInternals.vala src/.unitize/_ThreadsInternals.vala src/.unitize/_DbInternals.vala src/.unitize/_EditingToolsInternals.vala src/.unitize/_PluginsInternals.vala src/.unitize/_SlideshowInternals.vala src/.unitize/_PhotosInternals.vala src/.unitize/_PublishingInternals.vala src/.unitize/_LibraryInternals.vala src/.unitize/_DirectInternals.vala src/.unitize/_CoreInternals.vala src/.unitize/_SidebarInternals.vala src/.unitize/_EventsInternals.vala src/.unitize/_TagsInternals.vala src/.unitize/_CameraInternals.vala src/.unitize/_SearchesInternals.vala src/.unitize/_ConfigInternals.vala src/.unitize/_DataImportsInternals.vala src/.unitize/_FoldersInternals.vala src/.unitize/_Library_unitize_entry.vala src/.unitize/_Direct_unitize_entry.vala plugins/shotwell-plugin-dev-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi +$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ fi -$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala +$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ + fi +$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi @@ -6918,6 +6977,64 @@ $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala. $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi $(AM_V_at)mv -f $@-t $@ +$(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ + fi +$(srcdir)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ + fi +$(srcdir)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ + fi +$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ + fi +$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ + fi +$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -7011,123 +7128,6 @@ $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/shotwell-plugin-dev-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ - fi -$(srcdir)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ - fi -$(srcdir)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ - fi -$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \ - fi -$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \ - fi -$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)mv -f $@-t $@ mostlyclean-libtool: -rm -f *.lo diff --git a/configure b/configure index 539f1e8..36cb06c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for shotwell 0.25.0. +# Generated by GNU Autoconf 2.69 for shotwell 0.25.0.1. # # Report bugs to . # @@ -650,8 +650,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shotwell' PACKAGE_TARNAME='shotwell' -PACKAGE_VERSION='0.25.0' -PACKAGE_STRING='shotwell 0.25.0' +PACKAGE_VERSION='0.25.0.1' +PACKAGE_STRING='shotwell 0.25.0.1' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell' PACKAGE_URL='' @@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures shotwell 0.25.0 to adapt to many kinds of systems. +\`configure' configures shotwell 0.25.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1557,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shotwell 0.25.0:";; + short | recursive ) echo "Configuration of shotwell 0.25.0.1:";; esac cat <<\_ACEOF @@ -1720,7 +1720,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shotwell configure 0.25.0 +shotwell configure 0.25.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1998,7 +1998,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by shotwell $as_me 0.25.0, which was +It was created by shotwell $as_me 0.25.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2464,7 +2464,7 @@ MICRO_VERSION=0 API_VERSION=0 -GITVER=0a348fe98b77bf17b4cbe8a257eecffc966acbd7 +GITVER=8cc28654affe568f156bc74a20fb4959160ac872 if test "x$GITVER" != "x"; then @@ -2962,7 +2962,7 @@ fi # Define the identity of the package. PACKAGE='shotwell' - VERSION='0.25.0' + VERSION='0.25.0.1' cat >>confdefs.h <<_ACEOF @@ -17615,7 +17615,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shotwell $as_me 0.25.0, which was +This file was extended by shotwell $as_me 0.25.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17681,7 +17681,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shotwell config.status 0.25.0 +shotwell config.status 0.25.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c641f72..65198eb 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl *********************************************************************** m4_define([major_version],[0]) m4_define([minor_version],[25]) m4_define([micro_version],[0]) -m4_define([package_version],[major_version.minor_version.micro_version]) +m4_define([package_version],[major_version.minor_version.micro_version.1]) m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell]) m4_define([api_version],[major_version]) diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c index 382d4fe..81fbf20 100644 --- a/plugins/common/RESTSupport.c +++ b/plugins/common/RESTSupport.c @@ -1,4 +1,4 @@ -/* RESTSupport.c generated by valac 0.34.1, the Vala compiler +/* RESTSupport.c generated by valac 0.34.2, the Vala compiler * generated from RESTSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index 5ff91d7..f50b253 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.34.1, the Vala compiler +/* Resources.c generated by valac 0.34.2, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c index e430441..27f4f44 100644 --- a/plugins/common/WebAuthenticationPane.c +++ b/plugins/common/WebAuthenticationPane.c @@ -1,4 +1,4 @@ -/* WebAuthenticationPane.c generated by valac 0.34.1, the Vala compiler +/* WebAuthenticationPane.c generated by valac 0.34.2, the Vala compiler * generated from WebAuthenticationPane.vala, do not modify */ /* Copyright 2016 Jens Georg diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index 8db5f91..960dde9 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.34.1, the Vala compiler +/* FSpotDatabase.c generated by valac 0.34.2, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c index 8217032..c860abc 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseBehavior.c generated by valac 0.34.1, the Vala compiler +/* FSpotDatabaseBehavior.c generated by valac 0.34.2, the Vala compiler * generated from FSpotDatabaseBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index fd4644e..bf549b1 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index 5edf5b6..f2c82a4 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.34.1, the Vala compiler +/* FSpotImporter.c generated by valac 0.34.2, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 94fd7c5..ee93b8d 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index 773290c..dfd5dbf 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 554c956..20cfee9 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index 20cb92a..cad8d5f 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotosTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index a4c521b..3fe36a3 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.c +++ b/plugins/shotwell-data-imports/FSpotRollsTable.c @@ -1,4 +1,4 @@ -/* FSpotRollsTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index a4866ce..0467e46 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.34.1, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.34.2, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 32a4f94..93da68d 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.34.1, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.34.2, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index a5c9f31..a3bf276 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.34.1, the Vala compiler +/* SqliteSupport.c generated by valac 0.34.2, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index 46de879..75b63ec 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.34.1, the Vala compiler +/* VersionNumber.c generated by valac 0.34.2, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index 6bc819c..48d8c93 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.34.1, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.34.2, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h index 4cae37f..a9d1ed8 100644 --- a/plugins/shotwell-plugin-common.h +++ b/plugins/shotwell-plugin-common.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.h generated by valac 0.34.1, the Vala compiler, do not modify */ +/* shotwell-plugin-common.h generated by valac 0.34.2, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__ diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi index f6213af..0aed09c 100644 --- a/plugins/shotwell-plugin-common.vapi +++ b/plugins/shotwell-plugin-common.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.vapi generated by valac 0.34.1, do not modify. */ +/* shotwell-plugin-common.vapi generated by valac 0.34.2, do not modify. */ namespace Publishing { namespace RESTSupport { diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h index 1fc97db..67385d6 100644 --- a/plugins/shotwell-plugin-dev-1.0.h +++ b/plugins/shotwell-plugin-dev-1.0.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.h generated by valac 0.34.1, the Vala compiler, do not modify */ +/* shotwell-plugin-dev-1.0.h generated by valac 0.34.2, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi index 3af85d1..c61cb4a 100644 --- a/plugins/shotwell-plugin-dev-1.0.vapi +++ b/plugins/shotwell-plugin-dev-1.0.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.1, do not modify. */ +/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.2, do not modify. */ namespace Spit { namespace DataImports { diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index f658eef..e89f86e 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.34.1, the Vala compiler +/* GalleryConnector.c generated by valac 0.34.2, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index 2888418..c9311da 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -1,4 +1,4 @@ -/* RajcePublishing.c generated by valac 0.34.1, the Vala compiler +/* RajcePublishing.c generated by valac 0.34.2, the Vala compiler * generated from RajcePublishing.vala, do not modify */ /* Copyright 2014 rajce.net diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index 6dfaa9a..18bf8ce 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -1,4 +1,4 @@ -/* TumblrPublishing.c generated by valac 0.34.1, the Vala compiler +/* TumblrPublishing.c generated by valac 0.34.2, the Vala compiler * generated from TumblrPublishing.vala, do not modify */ /* Copyright 2012 BJA Electronics diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 93f4aeb..4e9b0a1 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -1,4 +1,4 @@ -/* YandexPublishing.c generated by valac 0.34.1, the Vala compiler +/* YandexPublishing.c generated by valac 0.34.2, the Vala compiler * generated from YandexPublishing.vala, do not modify */ /* Copyright 2010+ Evgeniy Polyakov diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index 4b6ea4b..db8e249 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.34.1, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.34.2, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c index 4b08588..7c88a45 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.c +++ b/plugins/shotwell-publishing/FacebookPublishing.c @@ -1,4 +1,4 @@ -/* FacebookPublishing.c generated by valac 0.34.1, the Vala compiler +/* FacebookPublishing.c generated by valac 0.34.2, the Vala compiler * generated from FacebookPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index e6d9a5e..d65f678 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.34.1, the Vala compiler +/* FlickrPublishing.c generated by valac 0.34.2, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c index 7e6e19a..b64f426 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.c +++ b/plugins/shotwell-publishing/PicasaPublishing.c @@ -1,4 +1,4 @@ -/* PicasaPublishing.c generated by valac 0.34.1, the Vala compiler +/* PicasaPublishing.c generated by valac 0.34.2, the Vala compiler * generated from PicasaPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index f83e707..ada0062 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.34.1, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.34.2, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c index 4fb44d0..b1f6d33 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.c +++ b/plugins/shotwell-publishing/YouTubePublishing.c @@ -1,4 +1,4 @@ -/* YouTubePublishing.c generated by valac 0.34.1, the Vala compiler +/* YouTubePublishing.c generated by valac 0.34.2, the Vala compiler * generated from YouTubePublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index 0009ab9..13cf81d 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.34.1, the Vala compiler +/* shotwell-publishing.c generated by valac 0.34.2, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index ca6ff17..f6b5ef0 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.34.1, the Vala compiler +/* BlindsEffect.c generated by valac 0.34.2, the Vala compiler * generated from BlindsEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index 0542294..d0a3631 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.34.1, the Vala compiler +/* ChessEffect.c generated by valac 0.34.2, the Vala compiler * generated from ChessEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index 15b1730..7edfb12 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.34.1, the Vala compiler +/* CircleEffect.c generated by valac 0.34.2, the Vala compiler * generated from CircleEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index 9be7560..d588136 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.34.1, the Vala compiler +/* CirclesEffect.c generated by valac 0.34.2, the Vala compiler * generated from CirclesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index e6e8800..b5e7927 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.34.1, the Vala compiler +/* ClockEffect.c generated by valac 0.34.2, the Vala compiler * generated from ClockEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 71eb2a9..55b5df9 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.34.1, the Vala compiler +/* CrumbleEffect.c generated by valac 0.34.2, the Vala compiler * generated from CrumbleEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index a943b53..6586c42 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.34.1, the Vala compiler +/* FadeEffect.c generated by valac 0.34.2, the Vala compiler * generated from FadeEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 19b10bb..4c7b96e 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.34.1, the Vala compiler +/* SlideEffect.c generated by valac 0.34.2, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index 28bf4b1..6a3fcfd 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.34.1, the Vala compiler +/* SquaresEffect.c generated by valac 0.34.2, the Vala compiler * generated from SquaresEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index 2124bd5..0d2bb9b 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.34.1, the Vala compiler +/* StripesEffect.c generated by valac 0.34.2, the Vala compiler * generated from StripesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index cf83002..8f54fcf 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.34.1, the Vala compiler +/* shotwell-transitions.c generated by valac 0.34.2, the Vala compiler * generated from shotwell-transitions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/po/shotwell.pot b/po/shotwell.pot index 5084b08..69fa009 100644 --- a/po/shotwell.pot +++ b/po/shotwell.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: shotwell 0.25.0\n" "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" "product=Shotwell&component=Internationalization\n" -"POT-Creation-Date: 2016-10-24 20:11+0200\n" +"POT-Creation-Date: 2016-11-07 23:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c index 43a4d52..e727840 100644 --- a/src/.unitize/_CameraInternals.c +++ b/src/.unitize/_CameraInternals.c @@ -1,4 +1,4 @@ -/* _CameraInternals.c generated by valac 0.34.1, the Vala compiler +/* _CameraInternals.c generated by valac 0.34.2, the Vala compiler * generated from _CameraInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c index e56e526..2d5e5f7 100644 --- a/src/.unitize/_ConfigInternals.c +++ b/src/.unitize/_ConfigInternals.c @@ -1,4 +1,4 @@ -/* _ConfigInternals.c generated by valac 0.34.1, the Vala compiler +/* _ConfigInternals.c generated by valac 0.34.2, the Vala compiler * generated from _ConfigInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c index d4855d1..9ad8313 100644 --- a/src/.unitize/_CoreInternals.c +++ b/src/.unitize/_CoreInternals.c @@ -1,4 +1,4 @@ -/* _CoreInternals.c generated by valac 0.34.1, the Vala compiler +/* _CoreInternals.c generated by valac 0.34.2, the Vala compiler * generated from _CoreInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c index fe8100f..3eb333f 100644 --- a/src/.unitize/_DataImportsInternals.c +++ b/src/.unitize/_DataImportsInternals.c @@ -1,4 +1,4 @@ -/* _DataImportsInternals.c generated by valac 0.34.1, the Vala compiler +/* _DataImportsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _DataImportsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c index 2aa9d1b..0290569 100644 --- a/src/.unitize/_DbInternals.c +++ b/src/.unitize/_DbInternals.c @@ -1,4 +1,4 @@ -/* _DbInternals.c generated by valac 0.34.1, the Vala compiler +/* _DbInternals.c generated by valac 0.34.2, the Vala compiler * generated from _DbInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c index 85961e1..208cbb6 100644 --- a/src/.unitize/_DirectInternals.c +++ b/src/.unitize/_DirectInternals.c @@ -1,4 +1,4 @@ -/* _DirectInternals.c generated by valac 0.34.1, the Vala compiler +/* _DirectInternals.c generated by valac 0.34.2, the Vala compiler * generated from _DirectInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c index acf3bbf..308750f 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.34.1, the Vala compiler +/* _Direct_unitize_entry.c generated by valac 0.34.2, the Vala compiler * generated from _Direct_unitize_entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c index c5dd7fe..523ca8a 100644 --- a/src/.unitize/_EditingToolsInternals.c +++ b/src/.unitize/_EditingToolsInternals.c @@ -1,4 +1,4 @@ -/* _EditingToolsInternals.c generated by valac 0.34.1, the Vala compiler +/* _EditingToolsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _EditingToolsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c index 2374260..587b091 100644 --- a/src/.unitize/_EventsInternals.c +++ b/src/.unitize/_EventsInternals.c @@ -1,4 +1,4 @@ -/* _EventsInternals.c generated by valac 0.34.1, the Vala compiler +/* _EventsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _EventsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c index c960815..342563f 100644 --- a/src/.unitize/_FoldersInternals.c +++ b/src/.unitize/_FoldersInternals.c @@ -1,4 +1,4 @@ -/* _FoldersInternals.c generated by valac 0.34.1, the Vala compiler +/* _FoldersInternals.c generated by valac 0.34.2, the Vala compiler * generated from _FoldersInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c index 15241b2..58d4f47 100644 --- a/src/.unitize/_LibraryInternals.c +++ b/src/.unitize/_LibraryInternals.c @@ -1,4 +1,4 @@ -/* _LibraryInternals.c generated by valac 0.34.1, the Vala compiler +/* _LibraryInternals.c generated by valac 0.34.2, the Vala compiler * generated from _LibraryInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c index de79198..910f94f 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.34.1, the Vala compiler +/* _Library_unitize_entry.c generated by valac 0.34.2, the Vala compiler * generated from _Library_unitize_entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c index 53ba06e..7166991 100644 --- a/src/.unitize/_PhotosInternals.c +++ b/src/.unitize/_PhotosInternals.c @@ -1,4 +1,4 @@ -/* _PhotosInternals.c generated by valac 0.34.1, the Vala compiler +/* _PhotosInternals.c generated by valac 0.34.2, the Vala compiler * generated from _PhotosInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c index be0be24..cd6a451 100644 --- a/src/.unitize/_PluginsInternals.c +++ b/src/.unitize/_PluginsInternals.c @@ -1,4 +1,4 @@ -/* _PluginsInternals.c generated by valac 0.34.1, the Vala compiler +/* _PluginsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _PluginsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c index a15f3ee..639a43e 100644 --- a/src/.unitize/_PublishingInternals.c +++ b/src/.unitize/_PublishingInternals.c @@ -1,4 +1,4 @@ -/* _PublishingInternals.c generated by valac 0.34.1, the Vala compiler +/* _PublishingInternals.c generated by valac 0.34.2, the Vala compiler * generated from _PublishingInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c index 1fe85b9..c4258c1 100644 --- a/src/.unitize/_SearchesInternals.c +++ b/src/.unitize/_SearchesInternals.c @@ -1,4 +1,4 @@ -/* _SearchesInternals.c generated by valac 0.34.1, the Vala compiler +/* _SearchesInternals.c generated by valac 0.34.2, the Vala compiler * generated from _SearchesInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c index e7c951d..fb620c2 100644 --- a/src/.unitize/_SidebarInternals.c +++ b/src/.unitize/_SidebarInternals.c @@ -1,4 +1,4 @@ -/* _SidebarInternals.c generated by valac 0.34.1, the Vala compiler +/* _SidebarInternals.c generated by valac 0.34.2, the Vala compiler * generated from _SidebarInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c index d73c8f2..2f62724 100644 --- a/src/.unitize/_SlideshowInternals.c +++ b/src/.unitize/_SlideshowInternals.c @@ -1,4 +1,4 @@ -/* _SlideshowInternals.c generated by valac 0.34.1, the Vala compiler +/* _SlideshowInternals.c generated by valac 0.34.2, the Vala compiler * generated from _SlideshowInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c index ae84543..52fd320 100644 --- a/src/.unitize/_TagsInternals.c +++ b/src/.unitize/_TagsInternals.c @@ -1,4 +1,4 @@ -/* _TagsInternals.c generated by valac 0.34.1, the Vala compiler +/* _TagsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _TagsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c index 528e290..55c6aa8 100644 --- a/src/.unitize/_ThreadsInternals.c +++ b/src/.unitize/_ThreadsInternals.c @@ -1,4 +1,4 @@ -/* _ThreadsInternals.c generated by valac 0.34.1, the Vala compiler +/* _ThreadsInternals.c generated by valac 0.34.2, the Vala compiler * generated from _ThreadsInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c index b76cc33..2d1e534 100644 --- a/src/.unitize/_UnitInternals.c +++ b/src/.unitize/_UnitInternals.c @@ -1,4 +1,4 @@ -/* _UnitInternals.c generated by valac 0.34.1, the Vala compiler +/* _UnitInternals.c generated by valac 0.34.2, the Vala compiler * generated from _UnitInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c index 4dbd55a..288bc95 100644 --- a/src/.unitize/_UtilInternals.c +++ b/src/.unitize/_UtilInternals.c @@ -1,4 +1,4 @@ -/* _UtilInternals.c generated by valac 0.34.1, the Vala compiler +/* _UtilInternals.c generated by valac 0.34.2, the Vala compiler * generated from _UtilInternals.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/AppDirs.c b/src/AppDirs.c index 74a188b..323dc40 100644 --- a/src/AppDirs.c +++ b/src/AppDirs.c @@ -1,4 +1,4 @@ -/* AppDirs.c generated by valac 0.34.1, the Vala compiler +/* AppDirs.c generated by valac 0.34.2, the Vala compiler * generated from AppDirs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/AppWindow.c b/src/AppWindow.c index eda3ce5..8db77a9 100644 --- a/src/AppWindow.c +++ b/src/AppWindow.c @@ -1,4 +1,4 @@ -/* AppWindow.c generated by valac 0.34.1, the Vala compiler +/* AppWindow.c generated by valac 0.34.2, the Vala compiler * generated from AppWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Application.c b/src/Application.c index 45b19e4..c043b63 100644 --- a/src/Application.c +++ b/src/Application.c @@ -1,4 +1,4 @@ -/* Application.c generated by valac 0.34.1, the Vala compiler +/* Application.c generated by valac 0.34.2, the Vala compiler * generated from Application.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/BatchImport.c b/src/BatchImport.c index 9a5e5bc..2e236c7 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -1,4 +1,4 @@ -/* BatchImport.c generated by valac 0.34.1, the Vala compiler +/* BatchImport.c generated by valac 0.34.2, the Vala compiler * generated from BatchImport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -5472,7 +5472,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const #line 5473 "BatchImport.c" GeeHashSet* _tmp21_ = NULL; #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10413,7 +10413,7 @@ static void batch_import_class_init (BatchImportClass * klass) { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, GDK_TYPE_PIXBUF, G_TYPE_INT); + g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10460,7 +10460,7 @@ static void batch_import_instance_init (BatchImport * self) { #line 428 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->last_preparing_ms = (gulong) 0; #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->imported_full_md5_table = _tmp0_; #line 433 "/home/jens/Source/shotwell/src/BatchImport.vala" diff --git a/src/Box.c b/src/Box.c index 3cd73cc..20eb63b 100644 --- a/src/Box.c +++ b/src/Box.c @@ -1,4 +1,4 @@ -/* Box.c generated by valac 0.34.1, the Vala compiler +/* Box.c generated by valac 0.34.2, the Vala compiler * generated from Box.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c index 005707b..6b44df3 100644 --- a/src/CheckerboardLayout.c +++ b/src/CheckerboardLayout.c @@ -1,4 +1,4 @@ -/* CheckerboardLayout.c generated by valac 0.34.1, the Vala compiler +/* CheckerboardLayout.c generated by valac 0.34.2, the Vala compiler * generated from CheckerboardLayout.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/CollectionPage.c b/src/CollectionPage.c index b1e09ea..b310b4c 100644 --- a/src/CollectionPage.c +++ b/src/CollectionPage.c @@ -1,4 +1,4 @@ -/* CollectionPage.c generated by valac 0.34.1, the Vala compiler +/* CollectionPage.c generated by valac 0.34.2, the Vala compiler * generated from CollectionPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c index d4df675..2fec21a 100644 --- a/src/ColorTransformation.c +++ b/src/ColorTransformation.c @@ -1,4 +1,4 @@ -/* ColorTransformation.c generated by valac 0.34.1, the Vala compiler +/* ColorTransformation.c generated by valac 0.34.2, the Vala compiler * generated from ColorTransformation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/CommandManager.c b/src/CommandManager.c index 69ef7f6..cd4c8a2 100644 --- a/src/CommandManager.c +++ b/src/CommandManager.c @@ -1,4 +1,4 @@ -/* CommandManager.c generated by valac 0.34.1, the Vala compiler +/* CommandManager.c generated by valac 0.34.2, the Vala compiler * generated from CommandManager.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Commands.c b/src/Commands.c index 8005488..117eab4 100644 --- a/src/Commands.c +++ b/src/Commands.c @@ -1,4 +1,4 @@ -/* Commands.c generated by valac 0.34.1, the Vala compiler +/* Commands.c generated by valac 0.34.2, the Vala compiler * generated from Commands.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/CustomComponents.c b/src/CustomComponents.c index f156b46..843ff3f 100644 --- a/src/CustomComponents.c +++ b/src/CustomComponents.c @@ -1,4 +1,4 @@ -/* CustomComponents.c generated by valac 0.34.1, the Vala compiler +/* CustomComponents.c generated by valac 0.34.2, the Vala compiler * generated from CustomComponents.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Debug.c b/src/Debug.c index 253bd51..0f90aef 100644 --- a/src/Debug.c +++ b/src/Debug.c @@ -1,4 +1,4 @@ -/* Debug.c generated by valac 0.34.1, the Vala compiler +/* Debug.c generated by valac 0.34.2, the Vala compiler * generated from Debug.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c index 1b5019f..d22b1ca 100644 --- a/src/DesktopIntegration.c +++ b/src/DesktopIntegration.c @@ -1,4 +1,4 @@ -/* DesktopIntegration.c generated by valac 0.34.1, the Vala compiler +/* DesktopIntegration.c generated by valac 0.34.2, the Vala compiler * generated from DesktopIntegration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Dialogs.c b/src/Dialogs.c index 0820882..d3805b9 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1,4 +1,4 @@ -/* Dialogs.c generated by valac 0.34.1, the Vala compiler +/* Dialogs.c generated by valac 0.34.2, the Vala compiler * generated from Dialogs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -19043,7 +19043,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1); + _tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" combo_store = _tmp17_; #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19158,7 +19158,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_value_init (&_tmp40_, GDK_TYPE_PIXBUF); + g_value_init (&_tmp40_, gdk_pixbuf_get_type ()); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" g_value_take_object (&_tmp40_, _tmp39_); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19210,7 +19210,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp50_ = icon_pixbuf; #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_value_init (&_tmp51_, GDK_TYPE_PIXBUF); + g_value_init (&_tmp51_, gdk_pixbuf_get_type ()); #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" g_value_set_object (&_tmp51_, _tmp50_); #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" diff --git a/src/Dimensions.c b/src/Dimensions.c index 8593eff..a285197 100644 --- a/src/Dimensions.c +++ b/src/Dimensions.c @@ -1,4 +1,4 @@ -/* Dimensions.c generated by valac 0.34.1, the Vala compiler +/* Dimensions.c generated by valac 0.34.2, the Vala compiler * generated from Dimensions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c index 38932d1..f145214 100644 --- a/src/DirectoryMonitor.c +++ b/src/DirectoryMonitor.c @@ -1,4 +1,4 @@ -/* DirectoryMonitor.c generated by valac 0.34.1, the Vala compiler +/* DirectoryMonitor.c generated by valac 0.34.2, the Vala compiler * generated from DirectoryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2099,13 +2099,13 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -2948,13 +2948,13 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp0_ = NULL; #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->file_children = _data_->_tmp0_; #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp1_ = NULL; #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->dir_children = _data_->_tmp1_; #line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4250,7 +4250,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp72_ = NULL; #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp72_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->file_map); #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -4306,7 +4306,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _data_->_tmp81_ = NULL; #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _data_->_tmp81_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (_data_->dir_map); #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -7539,7 +7539,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo #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_TYPE_FILE, GFile)); + _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile)); #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" source_file = _tmp1_; #line 7540 "DirectoryMonitor.c" @@ -9165,7 +9165,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor #line 9160 "DirectoryMonitor.c" GeeArrayList* _tmp17_ = NULL; #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp17_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" _g_object_unref0 (pruned); #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9637,11 +9637,11 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self); #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->map = _tmp0_; #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" self->priv->id_map = _tmp1_; #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" @@ -9797,43 +9797,43 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) { #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize; #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_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" g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_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" - g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ()); + g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE); + g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ()); #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala" - 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_TYPE_FILE); + 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" 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 9834 "DirectoryMonitor.c" diff --git a/src/Event.c b/src/Event.c index 88c7dda..53cab01 100644 --- a/src/Event.c +++ b/src/Event.c @@ -1,4 +1,4 @@ -/* Event.c generated by valac 0.34.1, the Vala compiler +/* Event.c generated by valac 0.34.2, the Vala compiler * generated from Event.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Exporter.c b/src/Exporter.c index ef0deab..e889635 100644 --- a/src/Exporter.c +++ b/src/Exporter.c @@ -1,4 +1,4 @@ -/* Exporter.c generated by valac 0.34.1, the Vala compiler +/* Exporter.c generated by valac 0.34.2, the Vala compiler * generated from Exporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/International.c b/src/International.c index eb03bb2..bc86722 100644 --- a/src/International.c +++ b/src/International.c @@ -1,4 +1,4 @@ -/* International.c generated by valac 0.34.1, the Vala compiler +/* International.c generated by valac 0.34.2, the Vala compiler * generated from International.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c index c62e8b7..f8acc4e 100644 --- a/src/LibraryFiles.c +++ b/src/LibraryFiles.c @@ -1,4 +1,4 @@ -/* LibraryFiles.c generated by valac 0.34.1, the Vala compiler +/* LibraryFiles.c generated by valac 0.34.2, the Vala compiler * generated from LibraryFiles.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c index ebdfd74..dc9683f 100644 --- a/src/LibraryMonitor.c +++ b/src/LibraryMonitor.c @@ -1,4 +1,4 @@ -/* LibraryMonitor.c generated by valac 0.34.1, the Vala compiler +/* LibraryMonitor.c generated by valac 0.34.2, the Vala compiler * generated from LibraryMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2251,7 +2251,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) { #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" self->priv->discovered = _tmp28_; #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp29_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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" @@ -2624,7 +2624,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" _data_->_tmp4_ = NULL; #line 338 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _data_->_tmp4_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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 2631 "LibraryMonitor.c" @@ -6053,7 +6053,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) { #line 6054 "LibraryMonitor.c" GeeArrayList* _tmp39_ = NULL; #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp39_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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" @@ -8727,11 +8727,11 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) { #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" g_rec_mutex_init (&__lock_library_monitor_blacklist); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp0_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp0_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" library_monitor_blacklist = _tmp0_; #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp1_ = hash_timed_queue_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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); + _tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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 8736 "LibraryMonitor.c" @@ -8770,11 +8770,11 @@ static void library_monitor_instance_init (LibraryMonitor * self) { #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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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, 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_; #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" - _tmp5_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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_; #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala" diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c index 0ae31e2..d380875 100644 --- a/src/MediaDataRepresentation.c +++ b/src/MediaDataRepresentation.c @@ -1,4 +1,4 @@ -/* MediaDataRepresentation.c generated by valac 0.34.1, the Vala compiler +/* MediaDataRepresentation.c generated by valac 0.34.2, the Vala compiler * generated from MediaDataRepresentation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3481,7 +3481,7 @@ static void media_source_class_init (MediaSourceClass * klass) { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (klass)->finalize = media_source_finalize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - 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_TYPE_FILE, G_TYPE_FILE); + 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 3484 "MediaDataRepresentation.c" } @@ -3970,7 +3970,7 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->master_file_map = _tmp0_; #line 3975 "MediaDataRepresentation.c" @@ -6839,7 +6839,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_new ("media_import_completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, G_TYPE_FILE, G_TYPE_FILE); + g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ()); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_new ("trashcan_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6864,7 +6864,7 @@ static void media_source_collection_instance_init (MediaSourceCollection * self) #line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->offline_bin = NULL; #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->by_master_file = _tmp0_; #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c index e387e0b..0174523 100644 --- a/src/MediaInterfaces.c +++ b/src/MediaInterfaces.c @@ -1,4 +1,4 @@ -/* MediaInterfaces.c generated by valac 0.34.1, the Vala compiler +/* MediaInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from MediaInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c index 8f81cf6..dd49c19 100644 --- a/src/MediaMetadata.c +++ b/src/MediaMetadata.c @@ -1,4 +1,4 @@ -/* MediaMetadata.c generated by valac 0.34.1, the Vala compiler +/* MediaMetadata.c generated by valac 0.34.2, the Vala compiler * generated from MediaMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c index 9802989..e937870 100644 --- a/src/MediaMonitor.c +++ b/src/MediaMonitor.c @@ -1,4 +1,4 @@ -/* MediaMonitor.c generated by valac 0.34.1, the Vala compiler +/* MediaMonitor.c generated by valac 0.34.2, the Vala compiler * generated from MediaMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2166,7 +2166,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio #line 2167 "MediaMonitor.c" GeeHashMap* _tmp12_ = NULL; #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala" - _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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" diff --git a/src/MediaPage.c b/src/MediaPage.c index d6bc5c0..17bb81c 100644 --- a/src/MediaPage.c +++ b/src/MediaPage.c @@ -1,4 +1,4 @@ -/* MediaPage.c generated by valac 0.34.1, the Vala compiler +/* MediaPage.c generated by valac 0.34.2, the Vala compiler * generated from MediaPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c index cdb92b8..8fb3d67 100644 --- a/src/MediaViewTracker.c +++ b/src/MediaViewTracker.c @@ -1,4 +1,4 @@ -/* MediaViewTracker.c generated by valac 0.34.1, the Vala compiler +/* MediaViewTracker.c generated by valac 0.34.2, the Vala compiler * generated from MediaViewTracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c index 187fbc9..06e98f4 100644 --- a/src/MetadataWriter.c +++ b/src/MetadataWriter.c @@ -1,4 +1,4 @@ -/* MetadataWriter.c generated by valac 0.34.1, the Vala compiler +/* MetadataWriter.c generated by valac 0.34.2, the Vala compiler * generated from MetadataWriter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c index d2c467f..b13971c 100644 --- a/src/NaturalCollate.c +++ b/src/NaturalCollate.c @@ -1,4 +1,4 @@ -/* NaturalCollate.c generated by valac 0.34.1, the Vala compiler +/* NaturalCollate.c generated by valac 0.34.2, the Vala compiler * generated from NaturalCollate.vala, do not modify */ diff --git a/src/Orientation.c b/src/Orientation.c index 06baf5e..1ff247c 100644 --- a/src/Orientation.c +++ b/src/Orientation.c @@ -1,4 +1,4 @@ -/* Orientation.c generated by valac 0.34.1, the Vala compiler +/* Orientation.c generated by valac 0.34.2, the Vala compiler * generated from Orientation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Page.c b/src/Page.c index 3ec4a8c..eda0c75 100644 --- a/src/Page.c +++ b/src/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.34.1, the Vala compiler +/* Page.c generated by valac 0.34.2, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Photo.c b/src/Photo.c index 7f36b6f..f2f519f 100644 --- a/src/Photo.c +++ b/src/Photo.c @@ -1,4 +1,4 @@ -/* Photo.c generated by valac 0.34.1, the Vala compiler +/* Photo.c generated by valac 0.34.2, the Vala compiler * generated from Photo.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15171,7 +15171,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) { #line 15170 "Photo.c" } #line 1945 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 1945 "/home/jens/Source/shotwell/src/Photo.vala" ret = _tmp1_; #line 15176 "Photo.c" @@ -34211,7 +34211,7 @@ static void photo_class_init (PhotoClass * klass) { #line 161 "/home/jens/Source/shotwell/src/Photo.vala" G_OBJECT_CLASS (klass)->finalize = photo_finalize; #line 161 "/home/jens/Source/shotwell/src/Photo.vala" - g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE); + g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ()); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 161 "/home/jens/Source/shotwell/src/Photo.vala" @@ -38400,11 +38400,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol #line 4461 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->_transaction_controller = NULL; #line 4462 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 4462 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_editable_file = _tmp0_; #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 4464 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->by_raw_development_file = _tmp1_; #line 4466 "/home/jens/Source/shotwell/src/Photo.vala" @@ -42137,19 +42137,19 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH #line 5383 "/home/jens/Source/shotwell/src/Photo.vala" self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 5384 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->editable_file_map = _tmp0_; #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 5386 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->development_file_map = _tmp1_; #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5388 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 5390 "/home/jens/Source/shotwell/src/Photo.vala" - _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 5390 "/home/jens/Source/shotwell/src/Photo.vala" self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap); #line 42151 "Photo.c" diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c index 0eb420e..084d735 100644 --- a/src/PhotoMonitor.c +++ b/src/PhotoMonitor.c @@ -1,4 +1,4 @@ -/* PhotoMonitor.c generated by valac 0.34.1, the Vala compiler +/* PhotoMonitor.c generated by valac 0.34.2, the Vala compiler * generated from PhotoMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1677,7 +1677,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) { #line 19 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" self->revert_to_master = FALSE; #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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" @@ -6226,7 +6226,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio #line 6225 "PhotoMonitor.c" GeeHashMap* _tmp17_ = NULL; #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala" - _tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, 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" diff --git a/src/PhotoPage.c b/src/PhotoPage.c index 33c1611..01ce089 100644 --- a/src/PhotoPage.c +++ b/src/PhotoPage.c @@ -1,4 +1,4 @@ -/* PhotoPage.c generated by valac 0.34.1, the Vala compiler +/* PhotoPage.c generated by valac 0.34.2, the Vala compiler * generated from PhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/PixbufCache.c b/src/PixbufCache.c index 33816ed..facd682 100644 --- a/src/PixbufCache.c +++ b/src/PixbufCache.c @@ -1,4 +1,4 @@ -/* PixbufCache.c generated by valac 0.34.1, the Vala compiler +/* PixbufCache.c generated by valac 0.34.2, the Vala compiler * generated from PixbufCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2520,7 +2520,7 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) { #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize; #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" - 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_TYPE_PIXBUF, G_TYPE_POINTER); + 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 2525 "PixbufCache.c" } @@ -2532,7 +2532,7 @@ static void pixbuf_cache_instance_init (PixbufCache * self) { #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->priv = PIXBUF_CACHE_GET_PRIVATE (self); #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala" - _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala" self->priv->cache = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala" diff --git a/src/Printing.c b/src/Printing.c index 78ac793..273adef 100644 --- a/src/Printing.c +++ b/src/Printing.c @@ -1,4 +1,4 @@ -/* Printing.c generated by valac 0.34.1, the Vala compiler +/* Printing.c generated by valac 0.34.2, the Vala compiler * generated from Printing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Properties.c b/src/Properties.c index 2efd284..df77935 100644 --- a/src/Properties.c +++ b/src/Properties.c @@ -1,4 +1,4 @@ -/* Properties.c generated by valac 0.34.1, the Vala compiler +/* Properties.c generated by valac 0.34.2, the Vala compiler * generated from Properties.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Resources.c b/src/Resources.c index 2fb4a0d..541b6ac 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.34.1, the Vala compiler +/* Resources.c generated by valac 0.34.2, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3244,7 +3244,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { #line 3216 "Resources.c" GeeHashMap* _tmp11_ = NULL; #line 913 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 913 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_icon_cache); #line 913 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3325,7 +3325,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { #line 3297 "Resources.c" GeeHashMap* _tmp27_ = NULL; #line 931 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_scaled_icon_cache); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3694,7 +3694,7 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar* #line 973 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = gicon; #line 973 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gtk_icon_theme_lookup_by_gicon (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_ICON, GIcon), RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE); + _tmp11_ = gtk_icon_theme_lookup_by_gicon (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_icon_get_type (), GIcon), RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE); #line 973 "/home/jens/Source/shotwell/src/Resources.vala" info = _tmp11_; #line 975 "/home/jens/Source/shotwell/src/Resources.vala" diff --git a/src/Screensaver.c b/src/Screensaver.c index 44dd0b8..06e1d59 100644 --- a/src/Screensaver.c +++ b/src/Screensaver.c @@ -1,4 +1,4 @@ -/* Screensaver.c generated by valac 0.34.1, the Vala compiler +/* Screensaver.c generated by valac 0.34.2, the Vala compiler * generated from Screensaver.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/SearchFilter.c b/src/SearchFilter.c index 7723bcf..1d891b7 100644 --- a/src/SearchFilter.c +++ b/src/SearchFilter.c @@ -1,4 +1,4 @@ -/* SearchFilter.c generated by valac 0.34.1, the Vala compiler +/* SearchFilter.c generated by valac 0.34.2, the Vala compiler * generated from SearchFilter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c index 119391a..187b5e5 100644 --- a/src/SlideshowPage.c +++ b/src/SlideshowPage.c @@ -1,4 +1,4 @@ -/* SlideshowPage.c generated by valac 0.34.1, the Vala compiler +/* SlideshowPage.c generated by valac 0.34.2, the Vala compiler * generated from SlideshowPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/SortedList.c b/src/SortedList.c index 3ba78e5..5704642 100644 --- a/src/SortedList.c +++ b/src/SortedList.c @@ -1,4 +1,4 @@ -/* SortedList.c generated by valac 0.34.1, the Vala compiler +/* SortedList.c generated by valac 0.34.2, the Vala compiler * generated from SortedList.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -130,13 +130,13 @@ gint64 file_comparator (void* a, void* b) { #line 12 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp0_ = a; #line 12 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, G_TYPE_FILE, GFile)); + _tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, g_file_get_type (), GFile)); #line 12 "/home/jens/Source/shotwell/src/SortedList.vala" path_a = _tmp1_; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" _tmp2_ = b; #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" - _tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, G_TYPE_FILE, GFile)); + _tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, g_file_get_type (), GFile)); #line 13 "/home/jens/Source/shotwell/src/SortedList.vala" path_b = _tmp3_; #line 16 "/home/jens/Source/shotwell/src/SortedList.vala" diff --git a/src/Tag.c b/src/Tag.c index 0d9a04a..9df503d 100644 --- a/src/Tag.c +++ b/src/Tag.c @@ -1,4 +1,4 @@ -/* Tag.c generated by valac 0.34.1, the Vala compiler +/* Tag.c generated by valac 0.34.2, the Vala compiler * generated from Tag.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Thumbnail.c b/src/Thumbnail.c index 78270ae..78b8d4b 100644 --- a/src/Thumbnail.c +++ b/src/Thumbnail.c @@ -1,4 +1,4 @@ -/* Thumbnail.c generated by valac 0.34.1, the Vala compiler +/* Thumbnail.c generated by valac 0.34.2, the Vala compiler * generated from Thumbnail.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c index aeb39de..e691057 100644 --- a/src/ThumbnailCache.c +++ b/src/ThumbnailCache.c @@ -1,4 +1,4 @@ -/* ThumbnailCache.c generated by valac 0.34.1, the Vala compiler +/* ThumbnailCache.c generated by valac 0.34.2, the Vala compiler * generated from ThumbnailCache.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -912,7 +912,7 @@ static void thumbnails_instance_init (Thumbnails * self) { #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv = THUMBNAILS_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" - _tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" self->priv->map = _tmp0_; #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala" diff --git a/src/TimedQueue.c b/src/TimedQueue.c index 73458a7..919234a 100644 --- a/src/TimedQueue.c +++ b/src/TimedQueue.c @@ -1,4 +1,4 @@ -/* TimedQueue.c generated by valac 0.34.1, the Vala compiler +/* TimedQueue.c generated by valac 0.34.2, the Vala compiler * generated from TimedQueue.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Tombstone.c b/src/Tombstone.c index 01bf175..de95373 100644 --- a/src/Tombstone.c +++ b/src/Tombstone.c @@ -1,4 +1,4 @@ -/* Tombstone.c generated by valac 0.34.1, the Vala compiler +/* Tombstone.c generated by valac 0.34.2, the Vala compiler * generated from Tombstone.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1904,7 +1904,7 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection #line 7 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv = TOMBSTONE_SOURCE_COLLECTION_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala" self->priv->file_map = _tmp0_; #line 1910 "Tombstone.c" diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c index 4f78059..e603ec5 100644 --- a/src/UnityProgressBar.c +++ b/src/UnityProgressBar.c @@ -1,4 +1,4 @@ -/* UnityProgressBar.c generated by valac 0.34.1, the Vala compiler +/* UnityProgressBar.c generated by valac 0.34.2, the Vala compiler * generated from UnityProgressBar.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/Upgrades.c b/src/Upgrades.c index 9d41ad1..f55ebcc 100644 --- a/src/Upgrades.c +++ b/src/Upgrades.c @@ -1,4 +1,4 @@ -/* Upgrades.c generated by valac 0.34.1, the Vala compiler +/* Upgrades.c generated by valac 0.34.2, the Vala compiler * generated from Upgrades.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c index e6c388c..76d63fe 100644 --- a/src/VideoMetadata.c +++ b/src/VideoMetadata.c @@ -1,4 +1,4 @@ -/* VideoMetadata.c generated by valac 0.34.1, the Vala compiler +/* VideoMetadata.c generated by valac 0.34.2, the Vala compiler * generated from VideoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c index 4e1cd61..19a7eeb 100644 --- a/src/VideoMonitor.c +++ b/src/VideoMonitor.c @@ -1,4 +1,4 @@ -/* VideoMonitor.c generated by valac 0.34.1, the Vala compiler +/* VideoMonitor.c generated by valac 0.34.2, the Vala compiler * generated from VideoMonitor.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/VideoSupport.c b/src/VideoSupport.c index 8529037..40ad3ea 100644 --- a/src/VideoSupport.c +++ b/src/VideoSupport.c @@ -1,4 +1,4 @@ -/* VideoSupport.c generated by valac 0.34.1, the Vala compiler +/* VideoSupport.c generated by valac 0.34.2, the Vala compiler * generated from VideoSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/Branch.c b/src/camera/Branch.c index 52c3e93..d8daac0 100644 --- a/src/camera/Branch.c +++ b/src/camera/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/Camera.c b/src/camera/Camera.c index 1f64b12..f2d3f42 100644 --- a/src/camera/Camera.c +++ b/src/camera/Camera.c @@ -1,4 +1,4 @@ -/* Camera.c generated by valac 0.34.1, the Vala compiler +/* Camera.c generated by valac 0.34.2, the Vala compiler * generated from Camera.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c index 85f762a..294f2ae 100644 --- a/src/camera/CameraTable.c +++ b/src/camera/CameraTable.c @@ -1,4 +1,4 @@ -/* CameraTable.c generated by valac 0.34.1, the Vala compiler +/* CameraTable.c generated by valac 0.34.2, the Vala compiler * generated from CameraTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c index 31f61f4..04c79de 100644 --- a/src/camera/GPhoto.c +++ b/src/camera/GPhoto.c @@ -1,4 +1,4 @@ -/* GPhoto.c generated by valac 0.34.1, the Vala compiler +/* GPhoto.c generated by valac 0.34.2, the Vala compiler * generated from GPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c index ecf784c..0abeb1f 100644 --- a/src/camera/ImportPage.c +++ b/src/camera/ImportPage.c @@ -1,4 +1,4 @@ -/* ImportPage.c generated by valac 0.34.1, the Vala compiler +/* ImportPage.c generated by valac 0.34.2, the Vala compiler * generated from ImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/config/Config.c b/src/config/Config.c index 397fbb0..013f9ba 100644 --- a/src/config/Config.c +++ b/src/config/Config.c @@ -1,4 +1,4 @@ -/* Config.c generated by valac 0.34.1, the Vala compiler +/* Config.c generated by valac 0.34.2, the Vala compiler * generated from Config.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c index cacb1ad..9081d18 100644 --- a/src/config/ConfigurationInterfaces.c +++ b/src/config/ConfigurationInterfaces.c @@ -1,4 +1,4 @@ -/* ConfigurationInterfaces.c generated by valac 0.34.1, the Vala compiler +/* ConfigurationInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from ConfigurationInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c index 8f52ace..e1ac2d2 100644 --- a/src/config/GSettingsEngine.c +++ b/src/config/GSettingsEngine.c @@ -1,4 +1,4 @@ -/* GSettingsEngine.c generated by valac 0.34.1, the Vala compiler +/* GSettingsEngine.c generated by valac 0.34.2, the Vala compiler * generated from GSettingsEngine.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/Alteration.c b/src/core/Alteration.c index 6e3ca88..c8b2460 100644 --- a/src/core/Alteration.c +++ b/src/core/Alteration.c @@ -1,4 +1,4 @@ -/* Alteration.c generated by valac 0.34.1, the Vala compiler +/* Alteration.c generated by valac 0.34.2, the Vala compiler * generated from Alteration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index 0fa5e34..20da1f2 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.34.1, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.34.2, the Vala compiler * generated from ContainerSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/Core.c b/src/core/Core.c index 5c9e67d..ee28231 100644 --- a/src/core/Core.c +++ b/src/core/Core.c @@ -1,4 +1,4 @@ -/* Core.c generated by valac 0.34.1, the Vala compiler +/* Core.c generated by valac 0.34.2, the Vala compiler * generated from Core.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c index 457e2f7..7265c0f 100644 --- a/src/core/DataCollection.c +++ b/src/core/DataCollection.c @@ -1,4 +1,4 @@ -/* DataCollection.c generated by valac 0.34.1, the Vala compiler +/* DataCollection.c generated by valac 0.34.2, the Vala compiler * generated from DataCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataObject.c b/src/core/DataObject.c index 84a9366..2bac8f3 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.34.1, the Vala compiler +/* DataObject.c generated by valac 0.34.2, the Vala compiler * generated from DataObject.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataSet.c b/src/core/DataSet.c index 6d2c3c6..a6c2415 100644 --- a/src/core/DataSet.c +++ b/src/core/DataSet.c @@ -1,4 +1,4 @@ -/* DataSet.c generated by valac 0.34.1, the Vala compiler +/* DataSet.c generated by valac 0.34.2, the Vala compiler * generated from DataSet.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataSource.c b/src/core/DataSource.c index a1d692d..34e5dde 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.34.1, the Vala compiler +/* DataSource.c generated by valac 0.34.2, the Vala compiler * generated from DataSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index a576ccc..a4f1f8b 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.34.1, the Vala compiler +/* DataSourceTypes.c generated by valac 0.34.2, the Vala compiler * generated from DataSourceTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataView.c b/src/core/DataView.c index 7729be1..417b78d 100644 --- a/src/core/DataView.c +++ b/src/core/DataView.c @@ -1,4 +1,4 @@ -/* DataView.c generated by valac 0.34.1, the Vala compiler +/* DataView.c generated by valac 0.34.2, the Vala compiler * generated from DataView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c index cbb3a73..24ff8cb 100644 --- a/src/core/DataViewTypes.c +++ b/src/core/DataViewTypes.c @@ -1,4 +1,4 @@ -/* DataViewTypes.c generated by valac 0.34.1, the Vala compiler +/* DataViewTypes.c generated by valac 0.34.2, the Vala compiler * generated from DataViewTypes.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c index b9606dd..c6c3cc9 100644 --- a/src/core/DatabaseSourceCollection.c +++ b/src/core/DatabaseSourceCollection.c @@ -1,4 +1,4 @@ -/* DatabaseSourceCollection.c generated by valac 0.34.1, the Vala compiler +/* DatabaseSourceCollection.c generated by valac 0.34.2, the Vala compiler * generated from DatabaseSourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 9d54b3c..8035c0b 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.34.1, the Vala compiler +/* SourceCollection.c generated by valac 0.34.2, the Vala compiler * generated from SourceCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c index c1b3e97..8b812ba 100644 --- a/src/core/SourceHoldingTank.c +++ b/src/core/SourceHoldingTank.c @@ -1,4 +1,4 @@ -/* SourceHoldingTank.c generated by valac 0.34.1, the Vala compiler +/* SourceHoldingTank.c generated by valac 0.34.2, the Vala compiler * generated from SourceHoldingTank.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c index 4df09cd..c76f0d2 100644 --- a/src/core/SourceInterfaces.c +++ b/src/core/SourceInterfaces.c @@ -1,4 +1,4 @@ -/* SourceInterfaces.c generated by valac 0.34.1, the Vala compiler +/* SourceInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from SourceInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/Tracker.c b/src/core/Tracker.c index 1d1bd50..a22b096 100644 --- a/src/core/Tracker.c +++ b/src/core/Tracker.c @@ -1,4 +1,4 @@ -/* Tracker.c generated by valac 0.34.1, the Vala compiler +/* Tracker.c generated by valac 0.34.2, the Vala compiler * generated from Tracker.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index 7c35370..0b5431f 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.34.1, the Vala compiler +/* ViewCollection.c generated by valac 0.34.2, the Vala compiler * generated from ViewCollection.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/util.c b/src/core/util.c index 927d070..ba8c9f8 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.34.1, the Vala compiler +/* util.c generated by valac 0.34.2, the Vala compiler * generated from util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c index 53ee367..b21d97e 100644 --- a/src/data_imports/DataImportJob.c +++ b/src/data_imports/DataImportJob.c @@ -1,4 +1,4 @@ -/* DataImportJob.c generated by valac 0.34.1, the Vala compiler +/* DataImportJob.c generated by valac 0.34.2, the Vala compiler * generated from DataImportJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index e5e0321..12a648f 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -1,4 +1,4 @@ -/* DataImportSource.c generated by valac 0.34.1, the Vala compiler +/* DataImportSource.c generated by valac 0.34.2, the Vala compiler * generated from DataImportSource.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c index 6c4ab60..79e795a 100644 --- a/src/data_imports/DataImports.c +++ b/src/data_imports/DataImports.c @@ -1,4 +1,4 @@ -/* DataImports.c generated by valac 0.34.1, the Vala compiler +/* DataImports.c generated by valac 0.34.2, the Vala compiler * generated from DataImports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index 4bd94a6..4f5a39b 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -1,4 +1,4 @@ -/* DataImportsPluginHost.c generated by valac 0.34.1, the Vala compiler +/* DataImportsPluginHost.c generated by valac 0.34.2, the Vala compiler * generated from DataImportsPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c index cb9749b..cd61c35 100644 --- a/src/data_imports/DataImportsUI.c +++ b/src/data_imports/DataImportsUI.c @@ -1,4 +1,4 @@ -/* DataImportsUI.c generated by valac 0.34.1, the Vala compiler +/* DataImportsUI.c generated by valac 0.34.2, the Vala compiler * generated from DataImportsUI.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c index 03b34e9..c12525d 100644 --- a/src/db/DatabaseTable.c +++ b/src/db/DatabaseTable.c @@ -1,4 +1,4 @@ -/* DatabaseTable.c generated by valac 0.34.1, the Vala compiler +/* DatabaseTable.c generated by valac 0.34.2, the Vala compiler * generated from DatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/Db.c b/src/db/Db.c index 72c8f32..2ad8248 100644 --- a/src/db/Db.c +++ b/src/db/Db.c @@ -1,4 +1,4 @@ -/* Db.c generated by valac 0.34.1, the Vala compiler +/* Db.c generated by valac 0.34.2, the Vala compiler * generated from Db.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/EventTable.c b/src/db/EventTable.c index 08f6ba3..63e2198 100644 --- a/src/db/EventTable.c +++ b/src/db/EventTable.c @@ -1,4 +1,4 @@ -/* EventTable.c generated by valac 0.34.1, the Vala compiler +/* EventTable.c generated by valac 0.34.2, the Vala compiler * generated from EventTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c index e88ee47..59a11d0 100644 --- a/src/db/PhotoTable.c +++ b/src/db/PhotoTable.c @@ -1,4 +1,4 @@ -/* PhotoTable.c generated by valac 0.34.1, the Vala compiler +/* PhotoTable.c generated by valac 0.34.2, the Vala compiler * generated from PhotoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c index 1bce91d..7a115ab 100644 --- a/src/db/SavedSearchDBTable.c +++ b/src/db/SavedSearchDBTable.c @@ -1,4 +1,4 @@ -/* SavedSearchDBTable.c generated by valac 0.34.1, the Vala compiler +/* SavedSearchDBTable.c generated by valac 0.34.2, the Vala compiler * generated from SavedSearchDBTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/TagTable.c b/src/db/TagTable.c index ef78a70..bd98bc0 100644 --- a/src/db/TagTable.c +++ b/src/db/TagTable.c @@ -1,4 +1,4 @@ -/* TagTable.c generated by valac 0.34.1, the Vala compiler +/* TagTable.c generated by valac 0.34.2, the Vala compiler * generated from TagTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c index e92f9a5..c9afb97 100644 --- a/src/db/TombstoneTable.c +++ b/src/db/TombstoneTable.c @@ -1,4 +1,4 @@ -/* TombstoneTable.c generated by valac 0.34.1, the Vala compiler +/* TombstoneTable.c generated by valac 0.34.2, the Vala compiler * generated from TombstoneTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c index c65621b..7aa577a 100644 --- a/src/db/VersionTable.c +++ b/src/db/VersionTable.c @@ -1,4 +1,4 @@ -/* VersionTable.c generated by valac 0.34.1, the Vala compiler +/* VersionTable.c generated by valac 0.34.2, the Vala compiler * generated from VersionTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c index 7d5c06e..736818c 100644 --- a/src/db/VideoTable.c +++ b/src/db/VideoTable.c @@ -1,4 +1,4 @@ -/* VideoTable.c generated by valac 0.34.1, the Vala compiler +/* VideoTable.c generated by valac 0.34.2, the Vala compiler * generated from VideoTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/Direct.c b/src/direct/Direct.c index 91704cf..f526072 100644 --- a/src/direct/Direct.c +++ b/src/direct/Direct.c @@ -1,4 +1,4 @@ -/* Direct.c generated by valac 0.34.1, the Vala compiler +/* Direct.c generated by valac 0.34.2, the Vala compiler * generated from Direct.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index b80ec06..b4c3f1c 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.34.1, the Vala compiler +/* DirectPhoto.c generated by valac 0.34.2, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; #line 2798 "DirectPhoto.c" diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c index 1eea167..dd66352 100644 --- a/src/direct/DirectPhotoPage.c +++ b/src/direct/DirectPhotoPage.c @@ -1,4 +1,4 @@ -/* DirectPhotoPage.c generated by valac 0.34.1, the Vala compiler +/* DirectPhotoPage.c generated by valac 0.34.2, the Vala compiler * generated from DirectPhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c index d829231..e4ec0ca 100644 --- a/src/direct/DirectView.c +++ b/src/direct/DirectView.c @@ -1,4 +1,4 @@ -/* DirectView.c generated by valac 0.34.1, the Vala compiler +/* DirectView.c generated by valac 0.34.2, the Vala compiler * generated from DirectView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c index cafd55d..ddaa2e1 100644 --- a/src/direct/DirectWindow.c +++ b/src/direct/DirectWindow.c @@ -1,4 +1,4 @@ -/* DirectWindow.c generated by valac 0.34.1, the Vala compiler +/* DirectWindow.c generated by valac 0.34.2, the Vala compiler * generated from DirectWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index 31a2bf2..bb602a2 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -1,4 +1,4 @@ -/* EditingTools.c generated by valac 0.34.1, the Vala compiler +/* EditingTools.c generated by valac 0.34.2, the Vala compiler * generated from EditingTools.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -4260,7 +4260,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - 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_TYPE_PIXBUF, GDK_TYPE_RECTANGLE); + 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 4265 "EditingTools.c" } @@ -4927,7 +4927,7 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, GDK_TYPE_PIXBUF, TYPE_DIMENSIONS, G_TYPE_BOOLEAN); + g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN); #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index b36afaf..bf13dcb 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.34.1, the Vala compiler +/* StraightenTool.c generated by valac 0.34.2, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/events/Branch.c b/src/events/Branch.c index af0e202..dba14ee 100644 --- a/src/events/Branch.c +++ b/src/events/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c index c15f5e7..207363d 100644 --- a/src/events/EventDirectoryItem.c +++ b/src/events/EventDirectoryItem.c @@ -1,4 +1,4 @@ -/* EventDirectoryItem.c generated by valac 0.34.1, the Vala compiler +/* EventDirectoryItem.c generated by valac 0.34.2, the Vala compiler * generated from EventDirectoryItem.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/events/EventPage.c b/src/events/EventPage.c index 0c1e86a..857ec3c 100644 --- a/src/events/EventPage.c +++ b/src/events/EventPage.c @@ -1,4 +1,4 @@ -/* EventPage.c generated by valac 0.34.1, the Vala compiler +/* EventPage.c generated by valac 0.34.2, the Vala compiler * generated from EventPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/events/Events.c b/src/events/Events.c index 5a36d5c..d1d1ee2 100644 --- a/src/events/Events.c +++ b/src/events/Events.c @@ -1,4 +1,4 @@ -/* Events.c generated by valac 0.34.1, the Vala compiler +/* Events.c generated by valac 0.34.2, the Vala compiler * generated from Events.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c index a009036..6dd1a90 100644 --- a/src/events/EventsDirectoryPage.c +++ b/src/events/EventsDirectoryPage.c @@ -1,4 +1,4 @@ -/* EventsDirectoryPage.c generated by valac 0.34.1, the Vala compiler +/* EventsDirectoryPage.c generated by valac 0.34.2, the Vala compiler * generated from EventsDirectoryPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/folders/Branch.c b/src/folders/Branch.c index 3cb5c74..6a51126 100644 --- a/src/folders/Branch.c +++ b/src/folders/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -998,7 +998,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala" file = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp2_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala" elements = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1497,7 +1497,7 @@ static void folders_branch_instance_init (FoldersBranch * self) { #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv = FOLDERS_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv->entries = _tmp0_; #line 1504 "Branch.c" @@ -1982,7 +1982,7 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", G_TYPE_FILE, 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, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" diff --git a/src/folders/Folders.c b/src/folders/Folders.c index c285978..e400ed6 100644 --- a/src/folders/Folders.c +++ b/src/folders/Folders.c @@ -1,4 +1,4 @@ -/* Folders.c generated by valac 0.34.1, the Vala compiler +/* Folders.c generated by valac 0.34.2, the Vala compiler * generated from Folders.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/folders/Page.c b/src/folders/Page.c index 65d265b..221e41e 100644 --- a/src/folders/Page.c +++ b/src/folders/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.34.1, the Vala compiler +/* Page.c generated by valac 0.34.2, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/Branch.c b/src/library/Branch.c index 27f51f8..2698af7 100644 --- a/src/library/Branch.c +++ b/src/library/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c index 2e3ddde..6ad004b 100644 --- a/src/library/FlaggedPage.c +++ b/src/library/FlaggedPage.c @@ -1,4 +1,4 @@ -/* FlaggedPage.c generated by valac 0.34.1, the Vala compiler +/* FlaggedPage.c generated by valac 0.34.2, the Vala compiler * generated from FlaggedPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c index 8067bd7..7bcb9af 100644 --- a/src/library/FlaggedSidebarEntry.c +++ b/src/library/FlaggedSidebarEntry.c @@ -1,4 +1,4 @@ -/* FlaggedSidebarEntry.c generated by valac 0.34.1, the Vala compiler +/* FlaggedSidebarEntry.c generated by valac 0.34.2, the Vala compiler * generated from FlaggedSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index 112dd16..916c8b2 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.34.1, the Vala compiler +/* ImportQueuePage.c generated by valac 0.34.2, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c index c218235..e756a2f 100644 --- a/src/library/ImportQueueSidebarEntry.c +++ b/src/library/ImportQueueSidebarEntry.c @@ -1,4 +1,4 @@ -/* ImportQueueSidebarEntry.c generated by valac 0.34.1, the Vala compiler +/* ImportQueueSidebarEntry.c generated by valac 0.34.2, the Vala compiler * generated from ImportQueueSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index 93f2225..c9bd6df 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.34.1, the Vala compiler +/* LastImportPage.c generated by valac 0.34.2, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c index c1713c7..a1b2eb8 100644 --- a/src/library/LastImportSidebarEntry.c +++ b/src/library/LastImportSidebarEntry.c @@ -1,4 +1,4 @@ -/* LastImportSidebarEntry.c generated by valac 0.34.1, the Vala compiler +/* LastImportSidebarEntry.c generated by valac 0.34.2, the Vala compiler * generated from LastImportSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/Library.c b/src/library/Library.c index 68166f0..b3f58ca 100644 --- a/src/library/Library.c +++ b/src/library/Library.c @@ -1,4 +1,4 @@ -/* Library.c generated by valac 0.34.1, the Vala compiler +/* Library.c generated by valac 0.34.2, the Vala compiler * generated from Library.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index 5a491c5..d1dff0e 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -1,4 +1,4 @@ -/* LibraryWindow.c generated by valac 0.34.1, the Vala compiler +/* LibraryWindow.c generated by valac 0.34.2, the Vala compiler * generated from LibraryWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c index ec05a96..739d6b1 100644 --- a/src/library/OfflinePage.c +++ b/src/library/OfflinePage.c @@ -1,4 +1,4 @@ -/* OfflinePage.c generated by valac 0.34.1, the Vala compiler +/* OfflinePage.c generated by valac 0.34.2, the Vala compiler * generated from OfflinePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c index 048774d..5273583 100644 --- a/src/library/OfflineSidebarEntry.c +++ b/src/library/OfflineSidebarEntry.c @@ -1,4 +1,4 @@ -/* OfflineSidebarEntry.c generated by valac 0.34.1, the Vala compiler +/* OfflineSidebarEntry.c generated by valac 0.34.2, the Vala compiler * generated from OfflineSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c index 1d51ff5..78ec0e1 100644 --- a/src/library/TrashPage.c +++ b/src/library/TrashPage.c @@ -1,4 +1,4 @@ -/* TrashPage.c generated by valac 0.34.1, the Vala compiler +/* TrashPage.c generated by valac 0.34.2, the Vala compiler * generated from TrashPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c index ab8fd8f..db1e2b9 100644 --- a/src/library/TrashSidebarEntry.c +++ b/src/library/TrashSidebarEntry.c @@ -1,4 +1,4 @@ -/* TrashSidebarEntry.c generated by valac 0.34.1, the Vala compiler +/* TrashSidebarEntry.c generated by valac 0.34.2, the Vala compiler * generated from TrashSidebarEntry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/main.c b/src/main.c index b006cc6..8387fbc 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.34.1, the Vala compiler +/* main.c generated by valac 0.34.2, the Vala compiler * generated from main.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index 538669d..19b2226 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -1,4 +1,4 @@ -/* BmpSupport.c generated by valac 0.34.1, the Vala compiler +/* BmpSupport.c generated by valac 0.34.2, the Vala compiler * generated from BmpSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 7aae9d7..bbd7376 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.34.1, the Vala compiler +/* GRaw.c generated by valac 0.34.2, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 08ee515..4f5a872 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.34.1, the Vala compiler +/* GdkSupport.c generated by valac 0.34.2, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c index cd5d127..0da9ce7 100644 --- a/src/photos/JfifSupport.c +++ b/src/photos/JfifSupport.c @@ -1,4 +1,4 @@ -/* JfifSupport.c generated by valac 0.34.1, the Vala compiler +/* JfifSupport.c generated by valac 0.34.2, the Vala compiler * generated from JfifSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index 859ca74..19038b8 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -1,4 +1,4 @@ -/* PhotoFileAdapter.c generated by valac 0.34.1, the Vala compiler +/* PhotoFileAdapter.c generated by valac 0.34.2, the Vala compiler * generated from PhotoFileAdapter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index f623c3f..a033e19 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -1,4 +1,4 @@ -/* PhotoFileFormat.c generated by valac 0.34.1, the Vala compiler +/* PhotoFileFormat.c generated by valac 0.34.2, the Vala compiler * generated from PhotoFileFormat.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c index 7351b3b..161349e 100644 --- a/src/photos/PhotoFileSniffer.c +++ b/src/photos/PhotoFileSniffer.c @@ -1,4 +1,4 @@ -/* PhotoFileSniffer.c generated by valac 0.34.1, the Vala compiler +/* PhotoFileSniffer.c generated by valac 0.34.2, the Vala compiler * generated from PhotoFileSniffer.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index f546f8f..def6140 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -1,4 +1,4 @@ -/* PhotoMetadata.c generated by valac 0.34.1, the Vala compiler +/* PhotoMetadata.c generated by valac 0.34.2, the Vala compiler * generated from PhotoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/Photos.c b/src/photos/Photos.c index 2395165..ee58ad3 100644 --- a/src/photos/Photos.c +++ b/src/photos/Photos.c @@ -1,4 +1,4 @@ -/* Photos.c generated by valac 0.34.1, the Vala compiler +/* Photos.c generated by valac 0.34.2, the Vala compiler * generated from Photos.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c index 11ca7ab..d3cb5c8 100644 --- a/src/photos/PngSupport.c +++ b/src/photos/PngSupport.c @@ -1,4 +1,4 @@ -/* PngSupport.c generated by valac 0.34.1, the Vala compiler +/* PngSupport.c generated by valac 0.34.2, the Vala compiler * generated from PngSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index ae5875d..6a65390 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.34.1, the Vala compiler +/* RawSupport.c generated by valac 0.34.2, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 9cc1094..74004f3 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -1,4 +1,4 @@ -/* TiffSupport.c generated by valac 0.34.1, the Vala compiler +/* TiffSupport.c generated by valac 0.34.2, the Vala compiler * generated from TiffSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c index 89fcadd..e7fb3d4 100644 --- a/src/plugins/DataImportsInterfaces.c +++ b/src/plugins/DataImportsInterfaces.c @@ -1,4 +1,4 @@ -/* DataImportsInterfaces.c generated by valac 0.34.1, the Vala compiler +/* DataImportsInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from DataImportsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c index 486c98c..9362909 100644 --- a/src/plugins/ManifestWidget.c +++ b/src/plugins/ManifestWidget.c @@ -1,4 +1,4 @@ -/* ManifestWidget.c generated by valac 0.34.1, the Vala compiler +/* ManifestWidget.c generated by valac 0.34.2, the Vala compiler * generated from ManifestWidget.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1404,7 +1404,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp46_ = _tmp45_; #line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_ICON, GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0); + _tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0); #line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp48_ = _tmp47_; #line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" @@ -2189,7 +2189,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView * #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self); #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" - _tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); + _tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, gdk_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING); #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" self->priv->store = _tmp0_; #line 2196 "ManifestWidget.c" diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index f5c638c..8040d16 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -1,4 +1,4 @@ -/* Plugins.c generated by valac 0.34.1, the Vala compiler +/* Plugins.c generated by valac 0.34.2, the Vala compiler * generated from Plugins.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c index 468329a..f42f462 100644 --- a/src/plugins/PublishingInterfaces.c +++ b/src/plugins/PublishingInterfaces.c @@ -1,4 +1,4 @@ -/* PublishingInterfaces.c generated by valac 0.34.1, the Vala compiler +/* PublishingInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from PublishingInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c index 0884982..da797f9 100644 --- a/src/plugins/SpitInterfaces.c +++ b/src/plugins/SpitInterfaces.c @@ -1,4 +1,4 @@ -/* SpitInterfaces.c generated by valac 0.34.1, the Vala compiler +/* SpitInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from SpitInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c index c6480fa..7e300b8 100644 --- a/src/plugins/StandardHostInterface.c +++ b/src/plugins/StandardHostInterface.c @@ -1,4 +1,4 @@ -/* StandardHostInterface.c generated by valac 0.34.1, the Vala compiler +/* StandardHostInterface.c generated by valac 0.34.2, the Vala compiler * generated from StandardHostInterface.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c index 9b1b5ac..1f05177 100644 --- a/src/plugins/TransitionsInterfaces.c +++ b/src/plugins/TransitionsInterfaces.c @@ -1,4 +1,4 @@ -/* TransitionsInterfaces.c generated by valac 0.34.1, the Vala compiler +/* TransitionsInterfaces.c generated by valac 0.34.2, the Vala compiler * generated from TransitionsInterfaces.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -726,7 +726,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k * 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, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, 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 731 "TransitionsInterfaces.c" /** * Returns the position of the starting pixbuf on the display. @@ -734,7 +734,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k * 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, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, 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 739 "TransitionsInterfaces.c" /** * Returns the ending pixbuf (the pixbuf that the transition should result in). @@ -742,7 +742,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k * 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, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, 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 747 "TransitionsInterfaces.c" /** * Returns the position of the ending pixbuf on the display. @@ -750,7 +750,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k * 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, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, 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 755 "TransitionsInterfaces.c" /** * Returns the background color of the viewport. diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c index 92b9412..1355179 100644 --- a/src/publishing/APIGlue.c +++ b/src/publishing/APIGlue.c @@ -1,4 +1,4 @@ -/* APIGlue.c generated by valac 0.34.1, the Vala compiler +/* APIGlue.c generated by valac 0.34.2, the Vala compiler * generated from APIGlue.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c index 99b7a82..603fb4c 100644 --- a/src/publishing/Publishing.c +++ b/src/publishing/Publishing.c @@ -1,4 +1,4 @@ -/* Publishing.c generated by valac 0.34.1, the Vala compiler +/* Publishing.c generated by valac 0.34.2, the Vala compiler * generated from Publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c index 6e24dc1..dd7f5a0 100644 --- a/src/publishing/PublishingPluginHost.c +++ b/src/publishing/PublishingPluginHost.c @@ -1,4 +1,4 @@ -/* PublishingPluginHost.c generated by valac 0.34.1, the Vala compiler +/* PublishingPluginHost.c generated by valac 0.34.2, the Vala compiler * generated from PublishingPluginHost.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c index a057694..ad6c097 100644 --- a/src/publishing/PublishingUI.c +++ b/src/publishing/PublishingUI.c @@ -1,4 +1,4 @@ -/* PublishingUI.c generated by valac 0.34.1, the Vala compiler +/* PublishingUI.c generated by valac 0.34.2, the Vala compiler * generated from PublishingUI.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1664,7 +1664,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" - _tmp43_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1); + _tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" _g_object_unref0 (self->priv->service_selector_box_model); #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala" diff --git a/src/searches/Branch.c b/src/searches/Branch.c index 7a2a970..409c89d 100644 --- a/src/searches/Branch.c +++ b/src/searches/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c index cff4982..10c261e 100644 --- a/src/searches/SavedSearchDialog.c +++ b/src/searches/SavedSearchDialog.c @@ -1,4 +1,4 @@ -/* SavedSearchDialog.c generated by valac 0.34.1, the Vala compiler +/* SavedSearchDialog.c generated by valac 0.34.2, the Vala compiler * generated from SavedSearchDialog.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c index 2b40a55..90e4575 100644 --- a/src/searches/SavedSearchPage.c +++ b/src/searches/SavedSearchPage.c @@ -1,4 +1,4 @@ -/* SavedSearchPage.c generated by valac 0.34.1, the Vala compiler +/* SavedSearchPage.c generated by valac 0.34.2, the Vala compiler * generated from SavedSearchPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c index 4918ae1..45d29d8 100644 --- a/src/searches/SearchBoolean.c +++ b/src/searches/SearchBoolean.c @@ -1,4 +1,4 @@ -/* SearchBoolean.c generated by valac 0.34.1, the Vala compiler +/* SearchBoolean.c generated by valac 0.34.2, the Vala compiler * generated from SearchBoolean.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/searches/Searches.c b/src/searches/Searches.c index caefb86..f6933e7 100644 --- a/src/searches/Searches.c +++ b/src/searches/Searches.c @@ -1,4 +1,4 @@ -/* Searches.c generated by valac 0.34.1, the Vala compiler +/* Searches.c generated by valac 0.34.2, the Vala compiler * generated from Searches.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c index cb9ad14..0e316cb 100644 --- a/src/sidebar/Branch.c +++ b/src/sidebar/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c index ae0aeb0..62b6068 100644 --- a/src/sidebar/Entry.c +++ b/src/sidebar/Entry.c @@ -1,4 +1,4 @@ -/* Entry.c generated by valac 0.34.1, the Vala compiler +/* Entry.c generated by valac 0.34.2, the Vala compiler * generated from Entry.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c index 328d6a9..3d479a0 100644 --- a/src/sidebar/Sidebar.c +++ b/src/sidebar/Sidebar.c @@ -1,4 +1,4 @@ -/* Sidebar.c generated by valac 0.34.1, the Vala compiler +/* Sidebar.c generated by valac 0.34.2, the Vala compiler * generated from Sidebar.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c index d3725be..ff26956 100644 --- a/src/sidebar/Tree.c +++ b/src/sidebar/Tree.c @@ -1,4 +1,4 @@ -/* Tree.c generated by valac 0.34.1, the Vala compiler +/* Tree.c generated by valac 0.34.2, the Vala compiler * generated from Tree.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/sidebar/common.c b/src/sidebar/common.c index 0a5eeb0..57f215c 100644 --- a/src/sidebar/common.c +++ b/src/sidebar/common.c @@ -1,4 +1,4 @@ -/* common.c generated by valac 0.34.1, the Vala compiler +/* common.c generated by valac 0.34.2, the Vala compiler * generated from common.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c index 0a92fb4..10edf7f 100644 --- a/src/slideshow/Slideshow.c +++ b/src/slideshow/Slideshow.c @@ -1,4 +1,4 @@ -/* Slideshow.c generated by valac 0.34.1, the Vala compiler +/* Slideshow.c generated by valac 0.34.2, the Vala compiler * generated from Slideshow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c index aa47a29..7040759 100644 --- a/src/slideshow/TransitionEffects.c +++ b/src/slideshow/TransitionEffects.c @@ -1,4 +1,4 @@ -/* TransitionEffects.c generated by valac 0.34.1, the Vala compiler +/* TransitionEffects.c generated by valac 0.34.2, the Vala compiler * generated from TransitionEffects.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/src/tags/Branch.c b/src/tags/Branch.c index a36626e..9a48e6a 100644 --- a/src/tags/Branch.c +++ b/src/tags/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.1, the Vala compiler +/* Branch.c generated by valac 0.34.2, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c index fc0a473..2451f2c 100644 --- a/src/tags/HierarchicalTagIndex.c +++ b/src/tags/HierarchicalTagIndex.c @@ -1,4 +1,4 @@ -/* HierarchicalTagIndex.c generated by valac 0.34.1, the Vala compiler +/* HierarchicalTagIndex.c generated by valac 0.34.2, the Vala compiler * generated from HierarchicalTagIndex.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c index bc4b608..88be1fa 100644 --- a/src/tags/HierarchicalTagUtilities.c +++ b/src/tags/HierarchicalTagUtilities.c @@ -1,4 +1,4 @@ -/* HierarchicalTagUtilities.c generated by valac 0.34.1, the Vala compiler +/* HierarchicalTagUtilities.c generated by valac 0.34.2, the Vala compiler * generated from HierarchicalTagUtilities.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index 54af84d..fb8b7a2 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -1,4 +1,4 @@ -/* TagPage.c generated by valac 0.34.1, the Vala compiler +/* TagPage.c generated by valac 0.34.2, the Vala compiler * generated from TagPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/tags/Tags.c b/src/tags/Tags.c index 1cafea2..901cc2a 100644 --- a/src/tags/Tags.c +++ b/src/tags/Tags.c @@ -1,4 +1,4 @@ -/* Tags.c generated by valac 0.34.1, the Vala compiler +/* Tags.c generated by valac 0.34.2, the Vala compiler * generated from Tags.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c index f497e25..02c8db6 100644 --- a/src/threads/BackgroundJob.c +++ b/src/threads/BackgroundJob.c @@ -1,4 +1,4 @@ -/* BackgroundJob.c generated by valac 0.34.1, the Vala compiler +/* BackgroundJob.c generated by valac 0.34.2, the Vala compiler * generated from BackgroundJob.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c index 09c49b8..d22656b 100644 --- a/src/threads/Semaphore.c +++ b/src/threads/Semaphore.c @@ -1,4 +1,4 @@ -/* Semaphore.c generated by valac 0.34.1, the Vala compiler +/* Semaphore.c generated by valac 0.34.2, the Vala compiler * generated from Semaphore.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/threads/Threads.c b/src/threads/Threads.c index 6a4a697..3c5eaea 100644 --- a/src/threads/Threads.c +++ b/src/threads/Threads.c @@ -1,4 +1,4 @@ -/* Threads.c generated by valac 0.34.1, the Vala compiler +/* Threads.c generated by valac 0.34.2, the Vala compiler * generated from Threads.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/threads/Workers.c b/src/threads/Workers.c index da62724..35b0d27 100644 --- a/src/threads/Workers.c +++ b/src/threads/Workers.c @@ -1,4 +1,4 @@ -/* Workers.c generated by valac 0.34.1, the Vala compiler +/* Workers.c generated by valac 0.34.2, the Vala compiler * generated from Workers.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/unit/Unit.c b/src/unit/Unit.c index 54f7d91..2d7acb8 100644 --- a/src/unit/Unit.c +++ b/src/unit/Unit.c @@ -1,4 +1,4 @@ -/* Unit.c generated by valac 0.34.1, the Vala compiler +/* Unit.c generated by valac 0.34.2, the Vala compiler * generated from Unit.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c index f5ccf28..180a69a 100644 --- a/src/util/KeyValueMap.c +++ b/src/util/KeyValueMap.c @@ -1,4 +1,4 @@ -/* KeyValueMap.c generated by valac 0.34.1, the Vala compiler +/* KeyValueMap.c generated by valac 0.34.2, the Vala compiler * generated from KeyValueMap.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/Util.c b/src/util/Util.c index dd62cd6..33aa26e 100644 --- a/src/util/Util.c +++ b/src/util/Util.c @@ -1,4 +1,4 @@ -/* Util.c generated by valac 0.34.1, the Vala compiler +/* Util.c generated by valac 0.34.2, the Vala compiler * generated from Util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/file.c b/src/util/file.c index b8f137f..9baf18c 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -1,4 +1,4 @@ -/* file.c generated by valac 0.34.1, the Vala compiler +/* file.c generated by valac 0.34.2, the Vala compiler * generated from file.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/image.c b/src/util/image.c index ab08347..9e1bb80 100644 --- a/src/util/image.c +++ b/src/util/image.c @@ -1,4 +1,4 @@ -/* image.c generated by valac 0.34.1, the Vala compiler +/* image.c generated by valac 0.34.2, the Vala compiler * generated from image.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/misc.c b/src/util/misc.c index 282f51f..b1a0d40 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -1,4 +1,4 @@ -/* misc.c generated by valac 0.34.1, the Vala compiler +/* misc.c generated by valac 0.34.2, the Vala compiler * generated from misc.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/string.c b/src/util/string.c index f2fe1cc..ccf6504 100644 --- a/src/util/string.c +++ b/src/util/string.c @@ -1,4 +1,4 @@ -/* string.c generated by valac 0.34.1, the Vala compiler +/* string.c generated by valac 0.34.2, the Vala compiler * generated from string.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/system.c b/src/util/system.c index efb9d36..8ab729d 100644 --- a/src/util/system.c +++ b/src/util/system.c @@ -1,4 +1,4 @@ -/* system.c generated by valac 0.34.1, the Vala compiler +/* system.c generated by valac 0.34.2, the Vala compiler * generated from system.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/ui.c b/src/util/ui.c index ac81527..be0f739 100644 --- a/src/util/ui.c +++ b/src/util/ui.c @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.34.1, the Vala compiler +/* ui.c generated by valac 0.34.2, the Vala compiler * generated from ui.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/thumbnailer/shotwell-video-thumbnailer.c b/thumbnailer/shotwell-video-thumbnailer.c index 2ffc94e..3a9f7a3 100644 --- a/thumbnailer/shotwell-video-thumbnailer.c +++ b/thumbnailer/shotwell-video-thumbnailer.c @@ -1,4 +1,4 @@ -/* shotwell-video-thumbnailer.c generated by valac 0.34.1, the Vala compiler +/* shotwell-video-thumbnailer.c generated by valac 0.34.2, the Vala compiler * generated from shotwell-video-thumbnailer.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/vapi/misc.vapi b/vapi/misc.vapi new file mode 100644 index 0000000..805f73e --- /dev/null +++ b/vapi/misc.vapi @@ -0,0 +1,8 @@ +namespace Workaround { +[CCode (cheader_filename = "glib.h", cname = "g_markup_collect_attributes", sentinel = "G_MARKUP_COLLECT_INVALID")] +extern bool markup_collect_attributes(string element_name, + [CCode (array_length = false, array_null_terminated = true)] + string[] attribute_names, + [CCode (array_length = false, array_null_terminated = true)] + string[] attribute_values, ...) throws GLib.MarkupError; +} -- cgit v1.2.3