From c43dfb815a4951b8248f4f0e98babe4f80204f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 3 Apr 2015 13:14:53 +0200 Subject: Imported Upstream version 0.22.0 --- plugins/shotwell-data-imports/FSpotDatabase.vala | 2 +- plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala | 2 +- plugins/shotwell-data-imports/FSpotDatabaseTable.vala | 2 +- plugins/shotwell-data-imports/FSpotImporter.vala | 10 ++++++++-- plugins/shotwell-data-imports/FSpotMetaTable.vala | 2 +- plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala | 2 +- plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala | 2 +- plugins/shotwell-data-imports/FSpotPhotosTable.vala | 2 +- plugins/shotwell-data-imports/FSpotRollsTable.vala | 2 +- plugins/shotwell-data-imports/FSpotTableBehavior.vala | 2 +- plugins/shotwell-data-imports/FSpotTagsTable.vala | 2 +- plugins/shotwell-data-imports/shotwell-data-imports.vala | 2 +- 12 files changed, 19 insertions(+), 13 deletions(-) (limited to 'plugins/shotwell-data-imports') diff --git a/plugins/shotwell-data-imports/FSpotDatabase.vala b/plugins/shotwell-data-imports/FSpotDatabase.vala index 634c5c9..7003ae6 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.vala +++ b/plugins/shotwell-data-imports/FSpotDatabase.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala index 973eb38..c8d8324 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala index eba64be..3c7744f 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU LGPL (version 2.1 or later). * See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala b/plugins/shotwell-data-imports/FSpotImporter.vala index 03abe01..593f456 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.vala +++ b/plugins/shotwell-data-imports/FSpotImporter.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -31,7 +31,7 @@ public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Bruno Girin"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; @@ -94,6 +94,7 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob private FSpotImportableRating rating; private string folder_path; private string filename; + private time_t? date_time; public FSpotImportableItem( DataImports.FSpot.Db.FSpotPhotoRow photo_row, @@ -109,6 +110,7 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob this.roll_row = roll_row; this.tags = tags; this.event = event; + this.date_time = photo_row.time; if (photo_row.rating > 0) this.rating = new FSpotImportableRating(photo_row.rating); else if (is_hidden) @@ -166,6 +168,10 @@ public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Ob public Spit.DataImports.ImportableRating get_rating() { return rating; } + + public time_t? get_exposure_time() { + return date_time; + } private string decode_url(string url) { StringBuilder builder = new StringBuilder(); diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.vala b/plugins/shotwell-data-imports/FSpotMetaTable.vala index b2d16eb..2e58379 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.vala +++ b/plugins/shotwell-data-imports/FSpotMetaTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala index 7d65594..b5897cb 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala index 8378884..9df0600 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.vala b/plugins/shotwell-data-imports/FSpotPhotosTable.vala index 4231102..5ef0751 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.vala +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.vala b/plugins/shotwell-data-imports/FSpotRollsTable.vala index fd5362d..6924762 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.vala +++ b/plugins/shotwell-data-imports/FSpotRollsTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.vala b/plugins/shotwell-data-imports/FSpotTableBehavior.vala index 2d94427..a0b003f 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.vala +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.vala b/plugins/shotwell-data-imports/FSpotTagsTable.vala index 07045cf..e846eb5 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.vala +++ b/plugins/shotwell-data-imports/FSpotTagsTable.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.vala b/plugins/shotwell-data-imports/shotwell-data-imports.vala index c6e7d46..8a16aaa 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.vala +++ b/plugins/shotwell-data-imports/shotwell-data-imports.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. -- cgit v1.2.3