Merge tag 'upstream/0.22.0'

Upstream version 0.22.0

1 files changed, 8 insertions, 2 deletions

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();