Merge lp:~codygarver/pantheon-photos/fix-1322215 into lp:~pantheon-photos/pantheon-photos/trunk

[Cody Garver]

Drop shotwell-data-imports, includes FSpot plugin (lp:1322215)

[Cody Garver (codygarver)]

The modifications to src/tags/HierarchicalTagUtilities.vala were to satisfy the build failure due to an unused code warning

[lp:~codygarver/pantheon-photos/fix-1322215]

2602. By Cody Garver on 2014-08-28

Merge in trunk and resolve conflicts

[meese (meese)]

review: Approve

=== modified file 'plugins/plugins.mk'
--- plugins/plugins.mk	2013-11-14 22:27:35 +0000
+++ plugins/plugins.mk	2014-08-28 06:03:26 +0000
@@ -1,8 +1,7 @@
 
 PLUGINS := \
 	shotwell-transitions \
-	shotwell-publishing \
-	shotwell-data-imports
+	shotwell-publishing
 
 PLUGINS_RC := \
 	plugins/shotwell-publishing/facebook.png \
@@ -24,7 +23,6 @@
 
 EXTRA_PLUGINS_RC := \
 	plugins/shotwell-publishing-extras/yandex_publish_model.glade \
-	plugins/shotwell-data-imports/f-spot-24.png \
 	plugins/shotwell-publishing-extras/tumblr.png \
 	plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
 	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade

=== removed directory 'plugins/shotwell-data-imports'
=== removed file 'plugins/shotwell-data-imports/FSpotDatabase.vala'
--- plugins/shotwell-data-imports/FSpotDatabase.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotDatabase.vala	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-public const int64 NULL_ID = 0;
-public const int64 INVALID_ID = -1;
-
-/**
- * Initialization method for the whole module.
- */
-public void init () {
-    FSpotDatabaseBehavior.create_behavior_map ();
-}
-
-/**
- * An object that is able to read from the F-Spot
- * database and extract the relevant objects.
- */
-public class FSpotDatabase : Object {
-    private Sqlite.Database fspot_db;
-    private FSpotMetaTable meta_table;
-    public FSpotPhotosTable photos_table;
-    public FSpotPhotoVersionsTable photo_versions_table;
-    public FSpotTagsTable tags_table;
-    public FSpotRollsTable rolls_table;
-    public int64 hidden_tag_id;
-
-    public FSpotDatabase (File db_file) throws DatabaseError, Spit.DataImports.DataImportError {
-        string filename = db_file.get_path ();
-        int res = Sqlite.Database.open_v2 (filename, out fspot_db,
-        Sqlite.OPEN_READONLY, null);
-        if (res != Sqlite.OK)
-            throw new DatabaseError.ERROR ("Unable to open F-Spot database %s: %d", filename, res);
-        meta_table = new FSpotMetaTable (fspot_db);
-        hidden_tag_id = meta_table.get_hidden_tag_id ();
-
-        FSpotDatabaseBehavior db_behavior = new FSpotDatabaseBehavior (get_version ());
-
-        photos_table = new FSpotPhotosTable (fspot_db, db_behavior);
-        photo_versions_table = new FSpotPhotoVersionsTable (fspot_db, db_behavior);
-        tags_table = new FSpotTagsTable (fspot_db, db_behavior);
-        rolls_table = new FSpotRollsTable (fspot_db, db_behavior);
-    }
-
-    ~FSpotDatabase () {
-    }
-
-    private Utils.VersionNumber get_version () throws DatabaseError {
-        return new Utils.VersionNumber.from_string (meta_table.get_db_version ());
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala'
--- plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-private class FSpotBehaviorEntry {
-    private Utils.VersionNumber version;
-    private FSpotTableBehavior behavior;
-
-    public FSpotBehaviorEntry (Utils.VersionNumber version, FSpotTableBehavior behavior) {
-        this.version = version;
-        this.behavior = behavior;
-    }
-
-    public Utils.VersionNumber get_version () {
-        return version;
-    }
-
-    public FSpotTableBehavior get_behavior () {
-        return behavior;
-    }
-}
-
-/**
- * A class that consolidates the behavior of all F-Spot tables (apart from meta)
- * and is the one place to check whether the database version is supported.
- */
-public class FSpotDatabaseBehavior : Object {
-    // Minimum unsupported version: any database from that version and above
-    // is not supported as it's too new and support has not been provided
-    // In practice, the code may work with future versions but this cannot be
-    // guaranteed as it hasn't been tested so it's probably better to just
-    // bomb out at that point rather than risk importing incorrect data
-    public static Utils.VersionNumber MIN_UNSUPPORTED_VERSION =
-        new Utils.VersionNumber ({ 19 });
-    private static Gee.Map<string, Gee.List<FSpotBehaviorEntry>> behavior_map;
-
-    private FSpotTableBehavior<FSpotPhotoRow> photos_behavior;
-    private FSpotTableBehavior<FSpotTagRow> tags_behavior;
-    private FSpotTableBehavior<FSpotPhotoTagRow> photo_tags_behavior;
-    private FSpotTableBehavior<FSpotPhotoVersionRow> photo_versions_behavior;
-    private FSpotTableBehavior<FSpotRollRow> rolls_behavior;
-
-    public static void create_behavior_map () {
-        behavior_map = new Gee.HashMap<string, Gee.List<FSpotBehaviorEntry>> ();
-        // photos table
-        Gee.List<FSpotBehaviorEntry> photos_list = new Gee.ArrayList<FSpotBehaviorEntry> ();
-        // v0-4
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 0 }),
-                             FSpotPhotosV0Behavior.get_instance ()
-                         ));
-        // v5-6
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 5 }),
-                             FSpotPhotosV5Behavior.get_instance ()
-                         ));
-        // v7-10
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 7 }),
-                             FSpotPhotosV7Behavior.get_instance ()
-                         ));
-        // v11-15
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 11 }),
-                             FSpotPhotosV11Behavior.get_instance ()
-                         ));
-        // v16
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 16 }),
-                             FSpotPhotosV16Behavior.get_instance ()
-                         ));
-        // v17
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 17 }),
-                             FSpotPhotosV17Behavior.get_instance ()
-                         ));
-        // v18+
-        photos_list.add (new FSpotBehaviorEntry (
-                             new Utils.VersionNumber ({ 18 }),
-                             FSpotPhotosV18Behavior.get_instance ()
-                         ));
-        behavior_map.set (FSpotPhotosTable.TABLE_NAME, photos_list);
-        // tags table
-        Gee.List<FSpotBehaviorEntry> tags_list = new Gee.ArrayList<FSpotBehaviorEntry> ();
-        // v0+
-        tags_list.add (new FSpotBehaviorEntry (
-                           new Utils.VersionNumber ({ 0 }),
-                           FSpotTagsV0Behavior.get_instance ()
-                       ));
-        behavior_map.set (FSpotTagsTable.TABLE_NAME, tags_list);
-        // photo_tags table
-        Gee.List<FSpotBehaviorEntry> photo_tags_list = new Gee.ArrayList<FSpotBehaviorEntry> ();
-        // v0+
-        photo_tags_list.add (new FSpotBehaviorEntry (
-                                 new Utils.VersionNumber ({ 0 }),
-                                 FSpotPhotoTagsV0Behavior.get_instance ()
-                             ));
-        behavior_map.set (FSpotPhotoTagsTable.TABLE_NAME, photo_tags_list);
-        // photo_versions table
-        Gee.List<FSpotBehaviorEntry> photo_versions_list = new Gee.ArrayList<FSpotBehaviorEntry> ();
-        // v0-8
-        photo_versions_list.add (new FSpotBehaviorEntry (
-                                     new Utils.VersionNumber ({ 0 }),
-                                     FSpotPhotoVersionsV0Behavior.get_instance ()
-                                 ));
-        // v9-15
-        photo_versions_list.add (new FSpotBehaviorEntry (
-                                     new Utils.VersionNumber ({ 9 }),
-                                     FSpotPhotoVersionsV9Behavior.get_instance ()
-                                 ));
-        // v16
-        photo_versions_list.add (new FSpotBehaviorEntry (
-                                     new Utils.VersionNumber ({ 16 }),
-                                     FSpotPhotoVersionsV16Behavior.get_instance ()
-                                 ));
-        // v17
-        photo_versions_list.add (new FSpotBehaviorEntry (
-                                     new Utils.VersionNumber ({ 17 }),
-                                     FSpotPhotoVersionsV17Behavior.get_instance ()
-                                 ));
-        // v18+
-        photo_versions_list.add (new FSpotBehaviorEntry (
-                                     new Utils.VersionNumber ({ 18 }),
-                                     FSpotPhotoVersionsV18Behavior.get_instance ()
-                                 ));
-        behavior_map.set (FSpotPhotoVersionsTable.TABLE_NAME, photo_versions_list);
-        // rolls table
-        Gee.List<FSpotBehaviorEntry> rolls_list = new Gee.ArrayList<FSpotBehaviorEntry> ();
-        // v0-4
-        rolls_list.add (new FSpotBehaviorEntry (
-                            new Utils.VersionNumber ({ 0 }),
-                            FSpotRollsV0Behavior.get_instance ()
-                        ));
-        // v5+
-        rolls_list.add (new FSpotBehaviorEntry (
-                            new Utils.VersionNumber ({ 5 }),
-                            FSpotRollsV5Behavior.get_instance ()
-                        ));
-        behavior_map.set (FSpotRollsTable.TABLE_NAME, rolls_list);
-    }
-
-    public static FSpotTableBehavior? find_behavior (string table_name, Utils.VersionNumber version) {
-        FSpotTableBehavior behavior = null;
-        Gee.List<FSpotBehaviorEntry> behavior_list = behavior_map.get (table_name);
-        if (behavior_list != null)
-            foreach (FSpotBehaviorEntry entry in behavior_list) {
-                if (version.compare_to (entry.get_version ()) >= 0)
-                    behavior = entry.get_behavior ();
-            }
-        else
-            warning ("Could not find behavior list for table %s", table_name);
-        return behavior;
-
-    }
-    public FSpotDatabaseBehavior (Utils.VersionNumber version) throws Spit.DataImports.DataImportError {
-        if (version.compare_to (MIN_UNSUPPORTED_VERSION) >= 0)
-            throw new Spit.DataImports.DataImportError.UNSUPPORTED_VERSION ("Version %s is not yet supported", version.to_string ());
-
-        FSpotTableBehavior? photos_generic_behavior = find_behavior (FSpotPhotosTable.TABLE_NAME, version);
-        if (photos_generic_behavior != null)
-            photos_behavior = photos_generic_behavior as FSpotTableBehavior<FSpotPhotoRow>;
-        FSpotTableBehavior? tags_generic_behavior = find_behavior (FSpotTagsTable.TABLE_NAME, version);
-        if (tags_generic_behavior != null)
-            tags_behavior = tags_generic_behavior as FSpotTableBehavior<FSpotTagRow>;
-        FSpotTableBehavior? photo_tags_generic_behavior = find_behavior (FSpotPhotoTagsTable.TABLE_NAME, version);
-        if (photo_tags_generic_behavior != null)
-            photo_tags_behavior = photo_tags_generic_behavior as FSpotTableBehavior<FSpotPhotoTagRow>;
-        FSpotTableBehavior? photo_versions_generic_behavior = find_behavior (FSpotPhotoVersionsTable.TABLE_NAME, version);
-        if (photo_versions_generic_behavior != null)
-            photo_versions_behavior = photo_versions_generic_behavior as FSpotTableBehavior<FSpotPhotoVersionRow>;
-        FSpotTableBehavior? rolls_generic_behavior = find_behavior (FSpotRollsTable.TABLE_NAME, version);
-        if (rolls_generic_behavior != null)
-            rolls_behavior = rolls_generic_behavior as FSpotTableBehavior<FSpotRollRow>;
-
-        if (photos_behavior == null || tags_behavior == null ||
-        photo_tags_behavior == null || photo_versions_behavior == null ||
-        rolls_behavior == null
-           )
-            throw new Spit.DataImports.DataImportError.UNSUPPORTED_VERSION ("Version %s is not supported", version.to_string ());
-    }
-
-    public FSpotTableBehavior<FSpotPhotoRow> get_photos_behavior () {
-        return photos_behavior;
-    }
-
-    public FSpotTableBehavior<FSpotTagRow> get_tags_behavior () {
-        return tags_behavior;
-    }
-
-    public FSpotTableBehavior<FSpotPhotoTagRow> get_photo_tags_behavior () {
-        return photo_tags_behavior;
-    }
-
-    public FSpotTableBehavior<FSpotPhotoVersionRow> get_photo_versions_behavior () {
-        return photo_versions_behavior;
-    }
-
-    public FSpotTableBehavior<FSpotRollRow> get_rolls_behavior () {
-        return rolls_behavior;
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotDatabaseTable.vala'
--- plugins/shotwell-data-imports/FSpotDatabaseTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotDatabaseTable.vala	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * This class represents a generic F-Spot table.
- */
-public abstract class FSpotDatabaseTable<T> : ImportableDatabaseTable {
-    protected unowned Sqlite.Database fspot_db;
-    protected FSpotTableBehavior<T> behavior;
-
-    public FSpotDatabaseTable (Sqlite.Database db) {
-        this.fspot_db = db;
-    }
-
-    public void set_behavior (FSpotTableBehavior<T> behavior) {
-        this.behavior = behavior;
-        set_table_name (behavior.get_table_name ());
-    }
-
-    public FSpotTableBehavior<T> get_behavior () {
-        return behavior;
-    }
-
-    protected string get_joined_column_list (bool with_table = false) {
-        string[] columns = behavior.list_columns ();
-        if (with_table)
-            for (int i = 0; i < columns.length; i++)
-                columns[i] = "%s.%s".printf (table_name, columns[i]);
-        return string.joinv (", ", columns);
-    }
-
-    protected int select_all (out Sqlite.Statement stmt) throws DatabaseError {
-        string column_list = get_joined_column_list ();
-        string sql = "SELECT %s FROM %s".printf (column_list, table_name);
-
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.step ();
-        if (res != Sqlite.ROW && res != Sqlite.DONE)
-            throw_error ("select_all %s %s".printf (table_name, column_list), res);
-
-        return res;
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotImporter.vala'
--- plugins/shotwell-data-imports/FSpotImporter.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotImporter.vala	1970-01-01 00:00:00 +0000
@@ -1,567 +0,0 @@
-/* Copyright 2009-2013 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.
- */
-
-public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service {
-    private const string ICON_FILENAME = "f-spot-24.png";
-
-    private static Gdk.Pixbuf[] icon_pixbuf_set = null;
-
-    public FSpotService (GLib.File resource_directory) {
-        // initialize the database layer
-        DataImports.FSpot.Db.init ();
-        if (icon_pixbuf_set == null)
-            icon_pixbuf_set = Resources.load_icon_set (resource_directory.get_child (ICON_FILENAME));
-    }
-
-    public int get_pluggable_interface (int min_host_interface, int max_host_interface) {
-        return Spit.negotiate_interfaces (min_host_interface, max_host_interface,
-                                          Spit.DataImports.CURRENT_INTERFACE);
-    }
-
-    public unowned string get_id () {
-        return "org.yorba.shotwell.dataimports.fspot";
-    }
-
-    public unowned string get_pluggable_name () {
-        return "F-Spot";
-    }
-
-    public void get_info (ref Spit.PluggableInfo info) {
-        info.authors = "Bruno Girin";
-        info.copyright = _ ("Copyright 2009-2013 Yorba Foundation");
-        info.translators = Resources.TRANSLATORS;
-        info.version = _VERSION;
-        info.website_name = Resources.WEBSITE_NAME;
-        info.website_url = Resources.WEBSITE_URL;
-        info.is_license_wordwrapped = false;
-        info.license = Resources.LICENSE;
-        info.icons = icon_pixbuf_set;
-    }
-
-    public void activation (bool enabled) {
-    }
-
-    public Spit.DataImports.DataImporter create_data_importer (Spit.DataImports.PluginHost host) {
-        return new DataImports.FSpot.FSpotDataImporter (this, host);
-    }
-}
-
-namespace DataImports.FSpot {
-
-internal const string SERVICE_NAME = "F-Spot";
-internal const string SERVICE_WELCOME_MESSAGE =
-    _ ("Welcome to the F-Spot library import service.\n\nPlease select a library to import, either by selecting one of the existing libraries found by Shotwell or by selecting an alternative F-Spot database file.");
-internal const string SERVICE_WELCOME_MESSAGE_FILE_ONLY =
-    _ ("Welcome to the F-Spot library import service.\n\nPlease select an F-Spot database file.");
-internal const string FILE_IMPORT_LABEL =
-    _ ("Manually select an F-Spot database file to import:");
-internal const string ERROR_CANT_OPEN_DB_FILE =
-    _ ("Cannot open the selected F-Spot database file: the file does not exist or is not an F-Spot database");
-internal const string ERROR_UNSUPPORTED_DB_VERSION =
-    _ ("Cannot open the selected F-Spot database file: this version of the F-Spot database is not supported by Shotwell");
-internal const string ERROR_CANT_READ_TAGS_TABLE =
-    _ ("Cannot read the selected F-Spot database file: error while reading tags table");
-internal const string ERROR_CANT_READ_PHOTOS_TABLE =
-    _ ("Cannot read the selected F-Spot database file: error while reading photos table");
-internal const string MESSAGE_FINAL_SCREEN =
-    _ ("Shotwell has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n\nYou can close this dialog and start using Shotwell while the import is taking place in the background.");
-
-public class FSpotImportableLibrary : Spit.DataImports.ImportableLibrary, GLib.Object {
-    private File db_file;
-
-    public FSpotImportableLibrary (File db_file) {
-        this.db_file = db_file;
-    }
-
-    public File get_db_file () {
-        return db_file;
-    }
-
-    public string get_display_name () {
-        return _ ("F-Spot library: %s").printf (db_file.get_path ());
-    }
-}
-
-public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Object {
-    private DataImports.FSpot.Db.FSpotPhotoRow photo_row;
-    private DataImports.FSpot.Db.FSpotPhotoVersionRow? photo_version_row;
-    private DataImports.FSpot.Db.FSpotRollRow? roll_row;
-    private FSpotImportableTag[] tags;
-    private FSpotImportableEvent? event;
-    private FSpotImportableRating rating;
-    private string folder_path;
-    private string filename;
-
-    public FSpotImportableItem (
-        DataImports.FSpot.Db.FSpotPhotoRow photo_row,
-        DataImports.FSpot.Db.FSpotPhotoVersionRow? photo_version_row,
-        DataImports.FSpot.Db.FSpotRollRow? roll_row,
-        FSpotImportableTag[] tags,
-        FSpotImportableEvent? event,
-        bool is_hidden,
-        bool is_favorite
-    ) {
-        this.photo_row = photo_row;
-        this.photo_version_row = photo_version_row;
-        this.roll_row = roll_row;
-        this.tags = tags;
-        this.event = event;
-        if (photo_row.rating > 0)
-            this.rating = new FSpotImportableRating (photo_row.rating);
-        else if (is_hidden)
-            this.rating = new FSpotImportableRating (FSpotImportableRating.REJECTED);
-        else if (is_favorite)
-            this.rating = new FSpotImportableRating (5);
-        else
-            this.rating = new FSpotImportableRating (FSpotImportableRating.UNRATED);
-
-        // store path and filename
-        folder_path = (photo_version_row != null) ?
-                      photo_version_row.base_path.get_path () :
-                      photo_row.base_path.get_path ();
-        filename = (photo_version_row != null) ?
-                   photo_version_row.filename :
-                   photo_row.filename;
-
-        // In theory, neither field should be null at that point but belts
-        // and braces don't hurt
-        if (folder_path != null && filename != null) {
-            // check if file exist and if not decode as URL
-            File photo = File.new_for_path (folder_path).get_child (filename);
-
-            // If file not found, parse as URI and store back
-            if (!photo.query_exists ()) {
-                folder_path = decode_url (folder_path);
-                filename = decode_url (filename);
-            }
-        }
-    }
-
-    public Spit.DataImports.ImportableTag[] get_tags () {
-        Spit.DataImports.ImportableTag[] importable_tags = new Spit.DataImports.ImportableTag[0];
-        foreach (FSpotImportableTag tag in tags)
-            importable_tags += tag;
-        return importable_tags;
-    }
-
-    public Spit.DataImports.ImportableEvent? get_event () {
-        return event;
-    }
-
-    public string get_folder_path () {
-        return folder_path;
-    }
-
-    public string get_filename () {
-        return filename;
-    }
-
-    public string? get_title () {
-        return (photo_row.description == null || photo_row.description == "") ? null : photo_row.description;
-    }
-
-    public Spit.DataImports.ImportableRating get_rating () {
-        return rating;
-    }
-
-    private string decode_url (string url) {
-        StringBuilder builder = new StringBuilder ();
-        for (int idx = 0; idx < url.length; ) {
-            int cidx = url.index_of_char ('%', idx);
-            if (cidx > idx) {
-                builder.append (url.slice (idx, cidx));
-            }
-            if (cidx >= 0) {
-                if (cidx < url.length - 2) {
-                    char c1 = url.get (cidx + 1);
-                    char c2 = url.get (cidx + 2);
-                    if (c1.isxdigit () && c1.isxdigit ()) {
-                        int ccode = 0x10 * c1.xdigit_value () + c2.xdigit_value ();
-                        builder.append_c ((char)ccode);
-                    }
-                    idx = cidx + 3;
-                } else {
-                    idx = cidx + 1;
-                }
-            } else {
-                builder.append (url.substring (idx));
-                idx = url.length;
-            }
-        }
-        return builder.str;
-    }
-}
-
-public class FSpotImportableTag : Spit.DataImports.ImportableTag, GLib.Object {
-    private DataImports.FSpot.Db.FSpotTagRow row;
-    private FSpotImportableTag? parent;
-
-    public FSpotImportableTag (DataImports.FSpot.Db.FSpotTagRow row, FSpotImportableTag? parent) {
-        this.row = row;
-        this.parent = parent;
-    }
-
-    public int64 get_id () {
-        return row.tag_id;
-    }
-
-    public string get_name () {
-        return row.name;
-    }
-
-    public Spit.DataImports.ImportableTag? get_parent () {
-        return parent;
-    }
-
-    public FSpotImportableTag? get_fspot_parent () {
-        return parent;
-    }
-
-    public string get_stock_icon () {
-        return row.stock_icon;
-    }
-
-    public bool is_stock () {
-        return (row.stock_icon.has_prefix (DataImports.FSpot.Db.FSpotTagsTable.PREFIX_STOCK_ICON));
-    }
-
-    public FSpotImportableEvent to_event () {
-        return new FSpotImportableEvent (this.row);
-    }
-}
-
-public class FSpotImportableEvent : Spit.DataImports.ImportableEvent, GLib.Object {
-    private DataImports.FSpot.Db.FSpotTagRow row;
-
-    public FSpotImportableEvent (DataImports.FSpot.Db.FSpotTagRow row) {
-        this.row = row;
-    }
-
-    public string get_name () {
-        return row.name;
-    }
-}
-
-public class FSpotImportableRating : Spit.DataImports.ImportableRating, GLib.Object {
-    public static const int REJECTED = -1;
-    public static const int UNRATED = 0;
-
-    private int rating_value;
-
-    public FSpotImportableRating (int rating_value) {
-        if (rating_value < -1)
-            rating_value = -1;
-        else if (rating_value > 5)
-            rating_value = 5;
-        this.rating_value = rating_value;
-    }
-
-    public bool is_rejected () {
-        return (rating_value == REJECTED);
-    }
-
-    public bool is_unrated () {
-        return (rating_value == UNRATED);
-    }
-
-    public int get_value () {
-        return rating_value;
-    }
-}
-
-internal class FSpotTagsCache : Object {
-    private DataImports.FSpot.Db.FSpotTagsTable tags_table;
-    private Gee.HashMap < int64?, FSpotImportableTag > tags_map;
-
-    public FSpotTagsCache (DataImports.FSpot.Db.FSpotTagsTable tags_table) throws DatabaseError {
-        this.tags_table = tags_table;
-        tags_map = new Gee.HashMap < int64?, FSpotImportableTag > ();
-    }
-
-    public FSpotImportableTag get_tag (DataImports.FSpot.Db.FSpotTagRow tag_row) throws DatabaseError {
-        FSpotImportableTag? tag = tags_map.get (tag_row.tag_id);
-        if (tag != null) {
-            return tag;
-        } else {
-            FSpotImportableTag? parent_tag = get_tag_from_id (tag_row.category_id);
-            FSpotImportableTag new_tag = new FSpotImportableTag (tag_row, parent_tag);
-            tags_map[tag_row.tag_id] = new_tag;
-            return new_tag;
-        }
-    }
-
-    private FSpotImportableTag? get_tag_from_id (int64 tag_id) throws DatabaseError {
-        // check whether the tag ID is valid first, otherwise return null
-        if (tag_id < 1)
-            return null;
-        FSpotImportableTag? tag = tags_map.get (tag_id);
-        if (tag != null)
-            return tag;
-        DataImports.FSpot.Db.FSpotTagRow? tag_row = tags_table.get_by_id (tag_id);
-        if (tag_row != null) {
-            FSpotImportableTag? parent_tag = get_tag_from_id (tag_row.category_id);
-            FSpotImportableTag new_tag = new FSpotImportableTag (tag_row, parent_tag);
-            tags_map[tag_id] = new_tag;
-            return new_tag;
-        }
-        return null;
-    }
-}
-
-public class FSpotDataImporter : Spit.DataImports.DataImporter, GLib.Object {
-
-    private weak Spit.DataImports.PluginHost host = null;
-    private weak Spit.DataImports.Service service = null;
-    private bool running = false;
-
-    public FSpotDataImporter (Spit.DataImports.Service service,
-                              Spit.DataImports.PluginHost host) {
-        debug ("FSpotDataImporter instantiated.");
-        this.service = service;
-        this.host = host;
-    }
-
-    private bool is_running () {
-        return running;
-    }
-
-    public Spit.DataImports.Service get_service () {
-        return service;
-    }
-
-    public void start () {
-        if (is_running ())
-            return;
-
-        debug ("FSpotDataImporter: starting interaction.");
-
-        running = true;
-
-        do_discover_importable_libraries ();
-    }
-
-    public void stop () {
-        debug ("FSpotDataImporter: stopping interaction.");
-
-        running = false;
-    }
-
-    // Actions and event implementation
-
-    /**
-     * Action that discovers importable libraries based on standard locations.
-     */
-    private void do_discover_importable_libraries () {
-        Spit.DataImports.ImportableLibrary[] discovered_libraries =
-            new Spit.DataImports.ImportableLibrary[0];
-
-        File[] db_files = {
-            // where the DB is in Ubuntu Lucid
-            File.new_for_path (Environment.get_user_config_dir ()).
-            get_child ("f-spot").get_child ("photos.db"),
-            // where it seems to be in Ubuntu Jaunty
-            File.new_for_path (Environment.get_home_dir ()).get_child (".gnome2").
-            get_child ("f-spot").get_child ("photos.db"),
-            // where it should really be if it followed the XDG spec
-            File.new_for_path (Environment.get_user_data_dir ()).
-            get_child ("f-spot").get_child ("photos.db")
-        };
-
-        foreach (File db_file in db_files) {
-            if (db_file.query_exists (null)) {
-                discovered_libraries += new FSpotImportableLibrary (db_file);
-                message ("Discovered importable library: %s", db_file.get_path ());
-            }
-        }
-
-        host.install_library_selection_pane (
-            (discovered_libraries.length > 0 ? SERVICE_WELCOME_MESSAGE : SERVICE_WELCOME_MESSAGE_FILE_ONLY),
-            discovered_libraries,
-            FILE_IMPORT_LABEL
-        );
-    }
-
-    public void on_library_selected (Spit.DataImports.ImportableLibrary library) {
-        on_file_selected (((FSpotImportableLibrary)library).get_db_file ());
-    }
-
-    public void on_file_selected (File file) {
-        DataImports.FSpot.Db.FSpotDatabase database;
-        FSpotTagsCache tags_cache;
-        Gee.ArrayList<DataImports.FSpot.Db.FSpotPhotoRow> all_photos;
-        double progress_delta_per_photo = 1.0;
-        double progress_plugin_to_host_ratio = 0.5;
-        double current_progress = 0.0;
-        try {
-            database = new DataImports.FSpot.Db.FSpotDatabase (file);
-        } catch (DatabaseError e) {
-            debug ("FSpotDataImporter: Can't open database file: %s".printf (e.message));
-            host.post_error_message (ERROR_CANT_OPEN_DB_FILE);
-            return;
-        } catch (Spit.DataImports.DataImportError e) {
-            debug ("FSpotDataImporter: Unsupported F-Spot database version: %s".printf (e.message));
-            host.post_error_message (ERROR_UNSUPPORTED_DB_VERSION);
-            return;
-        }
-        try {
-            tags_cache = new FSpotTagsCache (database.tags_table);
-        } catch (DatabaseError e) {
-            debug ("FSpotDataImporter: Can't read tags table: %s".printf (e.message));
-            host.post_error_message (ERROR_CANT_READ_TAGS_TABLE);
-            return;
-        }
-        host.install_import_progress_pane (_ ("Preparing to import"));
-        try {
-            all_photos = database.photos_table.get_all ();
-        } catch (DatabaseError e) {
-            debug ("FSpotDataImporter: Can't read photos table: %s".printf (e.message));
-            host.post_error_message (ERROR_CANT_READ_PHOTOS_TABLE);
-            return;
-        }
-        if (all_photos.size > 0)
-            progress_delta_per_photo = 1.0 / all_photos.size;
-        foreach (DataImports.FSpot.Db.FSpotPhotoRow photo_row in all_photos) {
-            bool hidden = false;
-            bool favorite = false;
-            FSpotImportableTag[] tags = new FSpotImportableTag[0];
-            FSpotImportableEvent? event = null;
-            DataImports.FSpot.Db.FSpotRollRow? roll_row = null;
-
-            // TODO: We do not convert F-Spot events to Shotwell events because F-Spot's events
-            // are essentially tags.  We would need to detect if the tag is an event (use
-            // is_tag_event) and then assign the event to the photo ... since a photo can be
-            // in multiple F-Spot events, we would need to pick one, and since their tags
-            // are hierarchical, we would need to pick a name (probably the leaf)
-            try {
-                foreach (
-                    DataImports.FSpot.Db.FSpotTagRow tag_row in
-                    database.tags_table.get_by_photo_id (photo_row.photo_id)
-                ) {
-                    FSpotImportableTag tag = tags_cache.get_tag (tag_row);
-                    if (is_tag_hidden (tag, database.hidden_tag_id))
-                        hidden = true;
-                    else if (is_tag_favorite (tag))
-                        favorite = true;
-                    else
-                        tags += tag;
-                }
-            } catch (DatabaseError e) {
-                // log the error and leave the tag list empty
-                message ("Failed to retrieve tags for photo ID %ld: %s", (long) photo_row.photo_id,
-                         e.message);
-            }
-
-            try {
-                roll_row = database.rolls_table.get_by_id (photo_row.roll_id);
-            } catch (DatabaseError e) {
-                // log the error and leave the roll row null
-                message ("Failed to retrieve roll for photo ID %ld: %s", (long) photo_row.photo_id,
-                         e.message);
-            }
-
-            Spit.DataImports.ImportableMediaItem[] importable_items = new Spit.DataImports.ImportableMediaItem[0];
-            try {
-                Gee.ArrayList<DataImports.FSpot.Db.FSpotPhotoVersionRow> photo_versions =
-                    database.photo_versions_table.get_by_photo_id (photo_row.photo_id);
-                bool photo_versions_added = false;   // set to true if at least one version was added
-                bool photo_versions_skipped = false; // set to true if at least one version was skipped due to missing file details
-                foreach (DataImports.FSpot.Db.FSpotPhotoVersionRow photo_version_row in photo_versions) {
-                    if (photo_version_row.base_path != null && photo_version_row.filename != null) {
-                        importable_items += new FSpotImportableItem (
-                                                photo_row, photo_version_row, roll_row, tags, event, hidden, favorite
-                                            );
-                        photo_versions_added = true;
-                    } else {
-                        photo_versions_skipped = true;
-                    }
-                }
-
-                // Older versions of F-Spot (0.4.3.1 at least, perhaps later) did not maintain photo_versions,
-                // this handles that case
-                // It also handles the case when we had to skip any photo version due to missing
-                // file details
-                if (photo_versions_skipped || !photo_versions_added) {
-                    if (photo_row.base_path != null && photo_row.filename != null) {
-                        importable_items += new FSpotImportableItem (
-                                                photo_row, null, roll_row, tags, event, hidden, favorite
-                                            );
-                    }
-                }
-            } catch (DatabaseError e) {
-                // if we can't load the different versions, do the best we can
-                // and create one photo from the photo row that was found earlier
-                message ("Failed to retrieve versions for photo ID %ld: %s", (long) photo_row.photo_id,
-                         e.message);
-                if (photo_row.base_path != null && photo_row.filename != null) {
-                    importable_items += new FSpotImportableItem (
-                                            photo_row, null, roll_row, tags, event, hidden, favorite
-                                        );
-                }
-            }
-            // If the importer is still running, import the items and loop,
-            // otherwise break the loop
-            if (running) {
-                host.prepare_media_items_for_import (
-                    importable_items,
-                    current_progress + (progress_delta_per_photo * progress_plugin_to_host_ratio),
-                    progress_delta_per_photo * (1 - progress_plugin_to_host_ratio),
-                    null
-                );
-                current_progress += progress_delta_per_photo;
-                host.update_import_progress_pane (current_progress);
-            } else {
-                break;
-            }
-        }
-        host.finalize_import (on_imported_items_count);
-    }
-
-    public void on_imported_items_count (int imported_items_count) {
-        host.install_static_message_pane (
-            MESSAGE_FINAL_SCREEN.printf (imported_items_count),
-            Spit.DataImports.PluginHost.ButtonMode.CLOSE
-        );
-    }
-
-    private bool is_tag_event (FSpotImportableTag tag) {
-        bool result = (DataImports.FSpot.Db.FSpotTagsTable.STOCK_ICON_EVENTS == tag.get_stock_icon ());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent ();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_event (parent);
-        }
-        return result;
-    }
-
-    private bool is_tag_hidden (FSpotImportableTag tag, int64 hidden_tag_id) {
-        bool result = (hidden_tag_id == tag.get_id ());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent ();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_hidden (parent, hidden_tag_id);
-        }
-        return result;
-    }
-
-    private bool is_tag_favorite (FSpotImportableTag tag) {
-        bool result = (DataImports.FSpot.Db.FSpotTagsTable.STOCK_ICON_FAV == tag.get_stock_icon ());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent ();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_favorite (parent);
-        }
-        return result;
-    }
-}
-
-} // namespace
-

=== removed file 'plugins/shotwell-data-imports/FSpotMetaTable.vala'
--- plugins/shotwell-data-imports/FSpotMetaTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotMetaTable.vala	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "meta" table, representing a single database row.
- */
-public class FSpotMetaRow : Object {
-    // ignore the ID
-    public string name;
-    public string data;
-}
-
-/**
- * This class represents the F-Spot meta table, which stores some essential
- * meta-data for the whole database. It is implemented as a simple dictionary
- * where each row in the table is a key/value pair.
- *
- * The meta table implementation is the only one that throws a database error
- * if something goes wrong because:
- *  * it is essential to read the content of that table in order to identify
- *    the version of the database and select the correct behavior,
- *  * this table is read at the very beginning of the process so any failure
- *    will occur immediately,
- *  * failing to read this table means that there is no point in reading the
- *    attempting to read the rest of the database so we might as well abort.
- */
-public class FSpotMetaTable : FSpotDatabaseTable<FSpotMetaRow> {
-
-    public FSpotMetaTable (Sqlite.Database db) {
-        base (db);
-        set_behavior (FSpotMetaBehavior.get_instance ());
-    }
-
-    public string? get_data (string name) throws DatabaseError {
-        string[] columns = behavior.list_columns ();
-        string column_list = string.joinv (", ", columns);
-        string sql = "SELECT %s FROM %s WHERE name=?".printf (column_list, table_name);
-        Sqlite.Statement stmt;
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.bind_text (1, name);
-        if (res != Sqlite.OK)
-            throw_error ("Bind failed for name %s".printf (name), res);
-
-        res = stmt.step ();
-        if (res != Sqlite.ROW) {
-            if (res != Sqlite.DONE)
-                throw_error ("FSpotMetaTable.get_data", res);
-
-            return null;
-        }
-
-        FSpotMetaRow row;
-        behavior.build_row (stmt, out row);
-        return row.data;
-    }
-
-    public string? get_app_version () throws DatabaseError {
-        return get_data ("F-Spot Version");
-    }
-
-    public string? get_db_version () throws DatabaseError {
-        return get_data ("F-Spot Database Version");
-    }
-
-    public int64 get_hidden_tag_id () throws DatabaseError {
-        string id_str = get_data ("Hidden Tag Id");
-        if (id_str != null) {
-            return int64.parse (id_str);
-        } else {
-            return -1;
-        }
-    }
-}
-
-public class FSpotMetaBehavior : FSpotTableBehavior<FSpotMetaRow>, Object {
-    public static const string TABLE_NAME = "Meta";
-
-    private static FSpotMetaBehavior instance;
-
-    private FSpotMetaBehavior () {
-    }
-
-    public static FSpotMetaBehavior get_instance () {
-        if (instance == null)
-            instance = new FSpotMetaBehavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "name", "data" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotMetaRow row, int offset = 0) {
-        row = new FSpotMetaRow ();
-        row.name = stmt.column_text (offset + 0);
-        row.data = stmt.column_text (offset + 1);
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala'
--- plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photo_tags" table, representing a single database row.
- */
-public class FSpotPhotoTagRow : Object {
-    public int64 photo_id;
-    public int64 tag_id;
-}
-
-/**
- * This class represents the F-Spot photo_tags table.
- */
-public class FSpotPhotoTagsTable : FSpotDatabaseTable<FSpotPhotoTagRow> {
-    public static const string TABLE_NAME = "Photo_Tags";
-
-    public FSpotPhotoTagsTable (Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base (db);
-        set_behavior (db_behavior.get_photo_tags_behavior ());
-    }
-}
-
-public class FSpotPhotoTagsV0Behavior : FSpotTableBehavior<FSpotPhotoTagRow>, Object {
-    private static FSpotPhotoTagsV0Behavior instance;
-
-    private FSpotPhotoTagsV0Behavior () {
-    }
-
-    public static FSpotPhotoTagsV0Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoTagsV0Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoTagsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "tag_id" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoTagRow row, int offset = 0) {
-        row = new FSpotPhotoTagRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.tag_id = stmt.column_int64 (offset + 1);
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala'
--- plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala	1970-01-01 00:00:00 +0000
@@ -1,275 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photo_versions" table, representing a single database row.
- */
-public class FSpotPhotoVersionRow : Object {
-    public int64 photo_id;
-    public int64 version_id;
-    public string name;
-    public File? base_path;
-    public string? filename;
-    public string md5_sum;
-    public bool is_protected;
-}
-
-/**
- * This class represents the F-Spot photo_versions table.
- */
-public class FSpotPhotoVersionsTable : FSpotDatabaseTable<FSpotPhotoVersionRow> {
-    public static const string TABLE_NAME = "Photo_versions";
-
-    public FSpotPhotoVersionsTable (Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base (db);
-        set_behavior (db_behavior.get_photo_versions_behavior ());
-    }
-
-    public Gee.ArrayList<FSpotPhotoVersionRow> get_by_photo_id (int64 photo_id) throws DatabaseError {
-        Gee.ArrayList<FSpotPhotoVersionRow> rows = new Gee.ArrayList < FSpotPhotoVersionRow?> ();
-
-        Sqlite.Statement stmt;
-
-        string column_list = get_joined_column_list ();
-        string sql = "SELECT %s FROM %s WHERE photo_id=?".printf (
-            column_list, table_name
-        );
-
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.bind_int64 (1, photo_id);
-        if (res != Sqlite.OK)
-            throw_error ("Bind failed for photo_id", res);
-
-        res = stmt.step ();
-        while (res == Sqlite.ROW) {
-            FSpotPhotoVersionRow row;
-            behavior.build_row (stmt, out row);
-            rows.add (row);
-            res = stmt.step ();
-        }
-
-        return rows;
-    }
-}
-
-// Photo_versions table behavior for v0-8
-// Note: there is a change in the URI format in version 8 but the File.new_for_uri
-// constructor should be able to deal with the variation, so the v8 behavior should
-// be handled in a way identical to v0-7
-public class FSpotPhotoVersionsV0Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV0Behavior instance;
-
-    private FSpotPhotoVersionsV0Behavior () {
-    }
-
-    public static FSpotPhotoVersionsV0Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV0Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "version_id", "name", "uri" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.version_id = stmt.column_int64 (offset + 1);
-        row.name = stmt.column_text (offset + 2);
-
-        string? full_path = stmt.column_text (offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.md5_sum = "";
-        row.is_protected = false;
-    }
-}
-
-// Photo_versions table behavior for v9-15
-// add protected field
-public class FSpotPhotoVersionsV9Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV9Behavior instance;
-
-    private FSpotPhotoVersionsV9Behavior () {
-    }
-
-    public static FSpotPhotoVersionsV9Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV9Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "version_id", "name", "uri",
-                 "protected"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.version_id = stmt.column_int64 (offset + 1);
-        row.name = stmt.column_text (offset + 2);
-
-        string? full_path = stmt.column_text (offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.md5_sum = "";
-        row.is_protected = (stmt.column_int (offset + 4) > 0);
-    }
-}
-
-// Photo_versions table behavior for v16
-// add md5_sum in photo_versions
-public class FSpotPhotoVersionsV16Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV16Behavior instance;
-
-    private FSpotPhotoVersionsV16Behavior () {
-    }
-
-    public static FSpotPhotoVersionsV16Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV16Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "version_id", "name", "uri",
-                 "md5_sum", "protected"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.version_id = stmt.column_int64 (offset + 1);
-        row.name = stmt.column_text (offset + 2);
-
-        string? full_path = stmt.column_text (offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.md5_sum = stmt.column_text (offset + 4);
-        row.is_protected = (stmt.column_int (offset + 5) > 0);
-    }
-}
-
-// Photo_versions table behavior for v17
-// v17 split the URI into base_uri and filename (reverting back to the original
-// design introduced in v0, albeit with a URI rather than a file system path)
-public class FSpotPhotoVersionsV17Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV17Behavior instance;
-
-    private FSpotPhotoVersionsV17Behavior () {
-    }
-
-    public static FSpotPhotoVersionsV17Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV17Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "version_id", "name", "base_uri", "filename",
-                 "md5_sum", "protected"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.version_id = stmt.column_int64 (offset + 1);
-        row.name = stmt.column_text (offset + 2);
-
-        string? base_path = stmt.column_text (offset + 3);
-        string? filename = stmt.column_text (offset + 4);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.md5_sum = stmt.column_text (offset + 5);
-        row.is_protected = (stmt.column_int (offset + 6) > 0);
-    }
-}
-
-// Photo_versions table behavior for v18
-// md5_sum renamed import_md5
-public class FSpotPhotoVersionsV18Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV18Behavior instance;
-
-    private FSpotPhotoVersionsV18Behavior () {
-    }
-
-    public static FSpotPhotoVersionsV18Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV18Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "photo_id", "version_id", "name", "base_uri", "filename",
-                 "import_md5", "protected"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.version_id = stmt.column_int64 (offset + 1);
-        row.name = stmt.column_text (offset + 2);
-
-        string? base_path = stmt.column_text (offset + 3);
-        string? filename = stmt.column_text (offset + 4);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.md5_sum = stmt.column_text (offset + 5);
-        row.is_protected = (stmt.column_int (offset + 6) > 0);
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotPhotosTable.vala'
--- plugins/shotwell-data-imports/FSpotPhotosTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotPhotosTable.vala	1970-01-01 00:00:00 +0000
@@ -1,363 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photos" table, representing a single database row.
- */
-public class FSpotPhotoRow : Object {
-    public int64 photo_id;
-    public time_t time;
-    public File? base_path;
-    public string? filename;
-    public string description;
-    public int64 roll_id;
-    public int64 default_version_id;
-    public int rating;
-    public string md5_sum;
-}
-
-/**
- * This class represents the F-Spot photos table.
- */
-public class FSpotPhotosTable : FSpotDatabaseTable<FSpotPhotoRow> {
-    public static const string TABLE_NAME = "Photos";
-
-    public FSpotPhotosTable (Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base (db);
-        set_behavior (db_behavior.get_photos_behavior ());
-    }
-
-    public Gee.ArrayList<FSpotPhotoRow> get_all () throws DatabaseError {
-        Gee.ArrayList<FSpotPhotoRow> all = new Gee.ArrayList < FSpotPhotoRow?> ();
-
-        Sqlite.Statement stmt;
-        int res = select_all (out stmt);
-        while (res == Sqlite.ROW) {
-            FSpotPhotoRow row;
-            behavior.build_row (stmt, out row);
-            all.add (row);
-            res = stmt.step ();
-        }
-
-        return all;
-    }
-}
-
-// Photos table behavior for v0-4
-// The original table format
-public class FSpotPhotosV0Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV0Behavior instance;
-
-    private FSpotPhotosV0Behavior () {
-    }
-
-    public static FSpotPhotosV0Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV0Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "directory_path", "name", "description",
-                 "default_version_id"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? base_path = stmt.column_text (offset + 2);
-        string? filename = stmt.column_text (offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.description = stmt.column_text (offset + 4);
-        row.roll_id = INVALID_ID;
-        row.default_version_id = stmt.column_int64 (offset + 5);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v5-6
-// v5 introduced a roll_id to reference the imported roll (rolls were a new
-// table migrated from imports)
-public class FSpotPhotosV5Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV5Behavior instance;
-
-    private FSpotPhotosV5Behavior () {
-    }
-
-    public static FSpotPhotosV5Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV5Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "directory_path", "name", "description", "roll_id",
-                 "default_version_id"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? base_path = stmt.column_text (offset + 2);
-        string? filename = stmt.column_text (offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.description = stmt.column_text (offset + 4);
-        row.roll_id = stmt.column_int64 (offset + 5);
-        row.default_version_id = stmt.column_int64 (offset + 6);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v7-10
-// v7 merged directory_path and name into a single URI value with a file://
-// prefix; presumaly this is meant to be able to handle remote files using a
-// different URI prefix such as remote files
-public class FSpotPhotosV7Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV7Behavior instance;
-
-    private FSpotPhotosV7Behavior () {
-    }
-
-    public static FSpotPhotosV7Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV7Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "uri", "description", "roll_id",
-                 "default_version_id"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? full_path = stmt.column_text (offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.description = stmt.column_text (offset + 3);
-        row.roll_id = stmt.column_int64 (offset + 4);
-        row.default_version_id = stmt.column_int64 (offset + 5);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v11-15
-// v11 introduced the concept of rating so add this to the list of fields
-public class FSpotPhotosV11Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV11Behavior instance;
-
-    private FSpotPhotosV11Behavior () {
-    }
-
-    public static FSpotPhotosV11Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV11Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "uri", "description", "roll_id",
-                 "default_version_id", "rating"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? full_path = stmt.column_text (offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.description = stmt.column_text (offset + 3);
-        row.roll_id = stmt.column_int64 (offset + 4);
-        row.default_version_id = stmt.column_int64 (offset + 5);
-        row.rating = stmt.column_int (offset + 6);
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v16
-// v16 introduced the MD5 sum so add this to the list of fields
-public class FSpotPhotosV16Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV16Behavior instance;
-
-    private FSpotPhotosV16Behavior () {
-    }
-
-    public static FSpotPhotosV16Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV16Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "uri", "description", "roll_id",
-                 "default_version_id", "rating", "md5_sum"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? full_path = stmt.column_text (offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri (full_path);
-            row.base_path = uri.get_parent ();
-            row.filename = uri.get_basename ();
-        }
-
-        row.description = stmt.column_text (offset + 3);
-        row.roll_id = stmt.column_int64 (offset + 4);
-        row.default_version_id = stmt.column_int64 (offset + 5);
-        row.rating = stmt.column_int (offset + 6);
-        row.md5_sum = stmt.column_text (offset + 7);
-    }
-}
-
-// Photos table behavior for v17
-// v17 split the URI into base_uri and filename (reverting back to the original
-// design introduced in v0, albeit with a URI rather than a file system path)
-public class FSpotPhotosV17Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV17Behavior instance;
-
-    private FSpotPhotosV17Behavior () {
-    }
-
-    public static FSpotPhotosV17Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV17Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "base_uri", "filename", "description", "roll_id",
-                 "default_version_id", "rating", "md5_sum"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? base_path = stmt.column_text (offset + 2);
-        string? filename = stmt.column_text (offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.description = stmt.column_text (offset + 4);
-        row.roll_id = stmt.column_int64 (offset + 5);
-        row.default_version_id = stmt.column_int64 (offset + 6);
-        row.rating = stmt.column_int (offset + 7);
-        row.md5_sum = stmt.column_text (offset + 8);
-    }
-}
-
-// v18: no more MD5 hash in the photos table: moved to photo_versions table
-public class FSpotPhotosV18Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV18Behavior instance;
-
-    private FSpotPhotosV18Behavior () {
-    }
-
-    public static FSpotPhotosV18Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotPhotosV18Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time", "base_uri", "filename", "description", "roll_id",
-                 "default_version_id", "rating"
-               };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow ();
-        row.photo_id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-
-        string? base_path = stmt.column_text (offset + 2);
-        string? filename = stmt.column_text (offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri (base_path);
-            row.filename = filename;
-        }
-
-        row.description = stmt.column_text (offset + 4);
-        row.roll_id = stmt.column_int64 (offset + 5);
-        row.default_version_id = stmt.column_int64 (offset + 6);
-        row.rating = stmt.column_int (offset + 7);
-        row.md5_sum = "";
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotRollsTable.vala'
--- plugins/shotwell-data-imports/FSpotRollsTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotRollsTable.vala	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "rolls" table, representing a single database row.
- */
-public class FSpotRollRow : Object {
-    public int64 id;
-    public time_t time;
-}
-
-/**
- * This class represents the F-Spot rolls table.
- */
-public class FSpotRollsTable : FSpotDatabaseTable<FSpotRollRow> {
-    public static const string TABLE_NAME = "Rolls";
-    public static const string TABLE_NAME_PRE_V5 = "Imports";
-
-    public FSpotRollsTable (Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base (db);
-        set_behavior (db_behavior.get_rolls_behavior ());
-    }
-
-    public FSpotRollRow? get_by_id (int64 roll_id) throws DatabaseError {
-        Sqlite.Statement stmt;
-        FSpotRollRow? row = null;
-        string column_list = get_joined_column_list ();
-        string sql = "SELECT %s FROM %s WHERE id=?".printf (column_list, table_name);
-
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.bind_int64 (1, roll_id);
-        if (res != Sqlite.OK)
-            throw_error ("Bind failed for roll_id", res);
-
-        res = stmt.step ();
-        if (res == Sqlite.ROW)
-            behavior.build_row (stmt, out row);
-        else if (res == Sqlite.DONE)
-            message ("Could not find roll row with ID %d", (int)roll_id);
-
-        return row;
-    }
-}
-
-// Rolls table behavior for v0-4
-public class FSpotRollsV0Behavior : FSpotTableBehavior<FSpotRollRow>, Object {
-    private static FSpotRollsV0Behavior instance;
-
-    private FSpotRollsV0Behavior () {
-    }
-
-    public static FSpotRollsV0Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotRollsV0Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotRollsTable.TABLE_NAME_PRE_V5;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotRollRow row, int offset = 0) {
-        row = new FSpotRollRow ();
-        row.id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-    }
-}
-
-// Rolls table behavior for v5+
-// Table name changed from "imports" to "rolls"
-public class FSpotRollsV5Behavior : FSpotTableBehavior<FSpotRollRow>, Object {
-    private static FSpotRollsV5Behavior instance;
-
-    private FSpotRollsV5Behavior () {
-    }
-
-    public static FSpotRollsV5Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotRollsV5Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotRollsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "time" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotRollRow row, int offset = 0) {
-        row = new FSpotRollRow ();
-        row.id = stmt.column_int64 (offset + 0);
-        row.time = (time_t) stmt.column_int64 (offset + 1);
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotTableBehavior.vala'
--- plugins/shotwell-data-imports/FSpotTableBehavior.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotTableBehavior.vala	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * This class defines a generic table behavior. In practice, it implements
- * the concept of a DAO (Data Access Object) in ORM terms and is responsible
- * for transforming the data extracted from a relational statement into a
- * lightweight value object.
- *
- * The type T defined in the generic is the value object type a behavior
- * implementation is designed to handle. Value object types are designed to
- * contain the data for a single database row.
- */
-public interface FSpotTableBehavior<T> : Object {
-    public abstract string get_table_name ();
-
-    public abstract string[] list_columns ();
-
-    public abstract void build_row (Sqlite.Statement stmt, out T row, int offset = 0);
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/FSpotTagsTable.vala'
--- plugins/shotwell-data-imports/FSpotTagsTable.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/FSpotTagsTable.vala	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "tags" table, representing a single database row.
- */
-public class FSpotTagRow : Object {
-    public int64 tag_id;
-    public string name;
-    public int64 category_id;
-    public bool is_category;
-    public int sort_priority;
-    public string stock_icon; // only store stock icons
-}
-
-/**
- * This class represents the F-Spot tags table.
- */
-public class FSpotTagsTable : FSpotDatabaseTable<FSpotTagRow> {
-    public static const string TABLE_NAME = "Tags";
-
-    public static const string PREFIX_STOCK_ICON = "stock_icon:";
-    public static const string STOCK_ICON_FAV    = "stock_icon:emblem-favorite";
-    public static const string STOCK_ICON_PEOPLE = "stock_icon:emblem-people";
-    public static const string STOCK_ICON_PLACES = "stock_icon:emblem-places";
-    public static const string STOCK_ICON_EVENTS = "stock_icon:emblem-event";
-
-    private FSpotTableBehavior<FSpotPhotoTagRow> photo_tags_behavior;
-
-    public FSpotTagsTable (Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base (db);
-        set_behavior (db_behavior.get_tags_behavior ());
-        photo_tags_behavior = db_behavior.get_photo_tags_behavior ();
-    }
-
-    public FSpotTagRow? get_by_id (int64 tag_id) throws DatabaseError {
-        Sqlite.Statement stmt;
-        FSpotTagRow? row = null;
-        string column_list = get_joined_column_list ();
-        string sql = "SELECT %s FROM %s WHERE id=?".printf (column_list, table_name);
-
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.bind_int64 (1, tag_id);
-        assert (res == Sqlite.OK);
-
-        res = stmt.step ();
-        if (res == Sqlite.ROW)
-            behavior.build_row (stmt, out row);
-        else if (res == Sqlite.DONE)
-            message ("Could not find tag row with ID %d", (int)tag_id);
-
-        return row;
-    }
-
-    public Gee.ArrayList<FSpotTagRow> get_by_photo_id (int64 photo_id) throws DatabaseError {
-        Gee.ArrayList<FSpotTagRow> rows = new Gee.ArrayList < FSpotTagRow?> ();
-
-        Sqlite.Statement stmt;
-
-        string column_list = get_joined_column_list (true);
-        string sql = "SELECT %1$s FROM %2$s, %3$s WHERE %3$s.photo_id=? AND %3$s.tag_id = %2$s.id".printf (
-            column_list, table_name, photo_tags_behavior.get_table_name ()
-        );
-
-        int res = fspot_db.prepare_v2 (sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error ("Statement failed: %s".printf (sql), res);
-
-        res = stmt.bind_int64 (1, photo_id);
-        if (res != Sqlite.OK)
-            throw_error ("Bind failed for photo_id", res);
-
-        res = stmt.step ();
-        while (res == Sqlite.ROW) {
-            FSpotTagRow row;
-            behavior.build_row (stmt, out row);
-            rows.add (row);
-            res = stmt.step ();
-        }
-
-        return rows;
-    }
-}
-
-public class FSpotTagsV0Behavior : FSpotTableBehavior<FSpotTagRow>, Object {
-    private static FSpotTagsV0Behavior instance;
-
-    private FSpotTagsV0Behavior () {
-    }
-
-    public static FSpotTagsV0Behavior get_instance () {
-        if (instance == null)
-            instance = new FSpotTagsV0Behavior ();
-        return instance;
-    }
-
-    public string get_table_name () {
-        return FSpotTagsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns () {
-        return { "id", "name", "category_id", "is_category", "sort_priority", "icon" };
-    }
-
-    public void build_row (Sqlite.Statement stmt, out FSpotTagRow row, int offset = 0) {
-        row = new FSpotTagRow ();
-        row.tag_id = stmt.column_int64 (offset + 0);
-        row.name = stmt.column_text (offset + 1);
-        row.category_id = stmt.column_int64 (offset + 2);
-        row.is_category = (stmt.column_int (offset + 3) > 0);
-        row.sort_priority = stmt.column_int (offset + 4);
-        string icon_str = stmt.column_text (offset + 5);
-        if (icon_str != null && icon_str.has_prefix (FSpotTagsTable.PREFIX_STOCK_ICON))
-            row.stock_icon = icon_str;
-        else
-            row.stock_icon = "";
-    }
-}
-
-}
-

=== removed file 'plugins/shotwell-data-imports/Makefile'
--- plugins/shotwell-data-imports/Makefile	2013-04-25 00:53:04 +0000
+++ plugins/shotwell-data-imports/Makefile	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-
-PLUGIN := shotwell-data-imports
-
-PLUGIN_PKGS := \
-	gtk+-3.0 \
-	gexiv2 \
-	gee-0.8 \
-	sqlite3
-
-SRC_FILES := \
-	shotwell-data-imports.vala \
-	../common/VersionNumber.vala \
-	../common/SqliteSupport.vala \
-	FSpotImporter.vala \
-	FSpotDatabaseBehavior.vala \
-	FSpotDatabase.vala \
-	FSpotDatabaseTable.vala \
-	FSpotTableBehavior.vala \
-	FSpotMetaTable.vala \
-	FSpotPhotosTable.vala \
-	FSpotPhotoTagsTable.vala \
-	FSpotPhotoVersionsTable.vala \
-	FSpotRollsTable.vala \
-	FSpotTagsTable.vala
-
-RC_FILES := \
-	f-spot-24.png
-
-include ../Makefile.plugin.mk
-

=== removed file 'plugins/shotwell-data-imports/f-spot-24.png'
Binary files plugins/shotwell-data-imports/f-spot-24.png	2012-02-02 22:56:06 +0000 and plugins/shotwell-data-imports/f-spot-24.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'plugins/shotwell-data-imports/shotwell-data-imports.vala'
--- plugins/shotwell-data-imports/shotwell-data-imports.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-data-imports/shotwell-data-imports.vala	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-extern const string _VERSION;
-
-// "core services" are: F-Spot
-private class ShotwellDataImportsCoreServices : Object, Spit.Module {
-    private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
-
-    // we need to get a module file handle because our pluggables have to load resources from the
-    // module file directory
-    public ShotwellDataImportsCoreServices (GLib.File module_file) {
-        GLib.File resource_directory = module_file.get_parent ();
-
-        pluggables += new FSpotService (resource_directory);
-    }
-
-    public unowned string get_module_name () {
-        return _ ("Core Data Import Services");
-    }
-
-    public unowned string get_version () {
-        return _VERSION;
-    }
-
-    public unowned string get_id () {
-        return "org.yorba.shotwell.data_imports.core_services";
-    }
-
-    public unowned Spit.Pluggable[]? get_pluggables () {
-        return pluggables;
-    }
-}
-
-// This entry point is required for all SPIT modules.
-public Spit.Module? spit_entry_point (Spit.EntryPointParams *params) {
-    params->module_spit_interface = Spit.negotiate_interfaces (params->host_min_spit_interface,
-                                    params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
-
-    return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-           ? new ShotwellDataImportsCoreServices (params->module_file) : null;
-}
-

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2014-08-20 20:14:47 +0000
+++ src/Dialogs.vala	2014-08-28 06:03:26 +0000
@@ -1884,12 +1884,10 @@
     Gtk.Box import_content;
     Gtk.Box import_action_checkbox_packer;
     Gtk.Box external_import_action_checkbox_packer;
-    Spit.DataImports.WelcomeImportMetaHost import_meta_host;
     bool import_content_already_installed = false;
     bool ok_clicked = false;
 
     public WelcomeDialog (Gtk.Window owner) {
-        import_meta_host = new Spit.DataImports.WelcomeImportMetaHost (this);
         bool show_system_pictures_import = is_system_pictures_import_possible ();
         Gtk.Widget ok_button = add_button (_ ("_Close"), Gtk.ResponseType.OK);
         set_title (_ ("Welcome!"));
@@ -1966,8 +1964,6 @@
         ok_button.grab_focus ();
 
         install_import_content ();
-
-        import_meta_host.start ();
     }
 
     private void install_import_content () {
@@ -2498,4 +2494,4 @@
         progress.close ();
 
     AppWindow.get_instance ().set_normal_cursor ();
-}
\ No newline at end of file
+}

=== removed directory 'src/data_imports'
=== removed file 'src/data_imports/DataImportJob.vala'
--- src/data_imports/DataImportJob.vala	2014-08-08 21:13:09 +0000
+++ src/data_imports/DataImportJob.vala	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-namespace Spit.DataImports  {
-
-/**
- * A specialized import job implementation for alien databases.
- */
-public class DataImportJob : BatchImportJob {
-    private DataImportSource import_source;
-    private File? src_file;
-    private uint64 filesize;
-    private time_t exposure_time;
-    private DataImportJob? associated = null;
-    private HierarchicalTagIndex? detected_htags = null;
-
-    public DataImportJob (DataImportSource import_source) {
-        this.import_source = import_source;
-
-        // stash everything called in prepare (), as it may/will be called from a separate thread
-        src_file = import_source.get_file ();
-        filesize = import_source.get_filesize ();
-        exposure_time = import_source.get_exposure_time ();
-    }
-
-    private HierarchicalTagIndex? build_exclusion_index (ImportableTag[] src_tags) {
-        Gee.Set<string> detected_htags = new Gee.HashSet<string> ();
-
-        foreach (ImportableTag src_tag in src_tags) {
-            string? prepped = HierarchicalTagUtilities.join_path_components (
-                                  Tag.prep_tag_names (
-                                      build_path_components (src_tag)
-                                  )
-                              );
-
-            if (prepped != null && prepped.has_prefix (Tag.PATH_SEPARATOR_STRING)) {
-                detected_htags.add (prepped);
-
-                Gee.List<string> parents = HierarchicalTagUtilities.enumerate_parent_paths (prepped);
-                foreach (string parent in parents)
-                    detected_htags.add (parent);
-            }
-        }
-
-        return (detected_htags.size > 0) ? HierarchicalTagIndex.from_paths (detected_htags) : null;
-    }
-
-    public time_t get_exposure_time () {
-        return exposure_time;
-    }
-
-    public override string get_dest_identifier () {
-        return import_source.get_filename ();
-    }
-
-    public override string get_source_identifier () {
-        return import_source.get_filename ();
-    }
-
-    public override bool is_directory () {
-        return false;
-    }
-
-    public override string get_basename () {
-        return src_file.get_basename ();
-    }
-
-    public override string get_path () {
-        return src_file.get_parent ().get_path ();
-    }
-
-    public override void set_associated (BatchImportJob associated) {
-        this.associated = associated as DataImportJob;
-    }
-
-    public override bool determine_file_size (out uint64 filesize, out File file) {
-        file = null;
-        filesize = this.filesize;
-
-        return true;
-    }
-
-    public override bool prepare (out File file_to_import, out bool copy_to_library) throws Error {
-        file_to_import = src_file;
-        copy_to_library = false;
-
-        detected_htags = build_exclusion_index (import_source.get_photo ().get_tags ());
-
-        return true;
-    }
-
-    public override bool complete (MediaSource source, BatchImportRoll import_roll) throws Error {
-        LibraryPhoto? photo = source as LibraryPhoto;
-        if (photo == null)
-            return false;
-
-        ImportableMediaItem src_photo = import_source.get_photo ();
-
-        // tags
-        if (detected_htags != null) {
-            Gee.Collection<string> paths = detected_htags.get_all_paths ();
-
-            foreach (string path in paths)
-                Tag.for_path (path);
-        }
-
-        ImportableTag[] src_tags = src_photo.get_tags ();
-        foreach (ImportableTag src_tag in src_tags) {
-            string? prepped = HierarchicalTagUtilities.join_path_components (
-                Tag.prep_tag_names (
-                    build_path_components (src_tag)
-                )
-            );
-            if (prepped != null) {
-                if (HierarchicalTagUtilities.enumerate_path_components (prepped).size == 1) {
-                    if (prepped.has_prefix (Tag.PATH_SEPARATOR_STRING))
-                        prepped = HierarchicalTagUtilities.hierarchical_to_flat (prepped);
-                } else {
-                    Gee.List<string> parents =
-                        HierarchicalTagUtilities.enumerate_parent_paths (prepped);
-
-                    assert (parents.size > 0);
-
-                    string top_level_parent = parents.get (0);
-                    string flat_top_level_parent =
-                        HierarchicalTagUtilities.hierarchical_to_flat (top_level_parent);
-
-                    if (Tag.global.exists (flat_top_level_parent))
-                        Tag.for_path (flat_top_level_parent).promote ();
-                }
-
-                Tag.for_path (prepped).attach (photo);
-            }
-        }
-        // event
-        ImportableEvent? src_event = src_photo.get_event ();
-        if (src_event != null) {
-            string? prepped = prepare_input_text (src_event.get_name (),
-                                                  PrepareInputTextOptions.DEFAULT, -1);
-            if (prepped != null)
-                Event.generate_single_event (photo, import_roll.generated_events, prepped);
-        }
-        // rating
-        Rating dst_rating;
-        ImportableRating src_rating = src_photo.get_rating ();
-        if (src_rating.is_rejected ())
-            dst_rating = Rating.REJECTED;
-        else if (src_rating.is_unrated ())
-            dst_rating = Rating.UNRATED;
-        else
-            dst_rating = Rating.unserialize (src_rating.get_value ());
-        photo.set_rating (dst_rating);
-        // title
-        string? title = src_photo.get_title ();
-        if (title != null)
-            photo.set_title (title);
-        // import ID
-        photo.set_import_id (import_roll.import_id);
-
-        return true;
-    }
-
-    private string[] build_path_components (ImportableTag tag) {
-        // use a linked list as we are always inserting in head position
-        Gee.List<string> components = new Gee.LinkedList<string> ();
-        for (ImportableTag current_tag = tag; current_tag != null; current_tag = current_tag.get_parent ()) {
-            components.insert (0, HierarchicalTagUtilities.make_flat_tag_safe (current_tag.get_name ()));
-        }
-        return components.to_array ();
-    }
-}
-
-}
-

=== removed file 'src/data_imports/DataImportSource.vala'
--- src/data_imports/DataImportSource.vala	2014-08-08 21:13:09 +0000
+++ src/data_imports/DataImportSource.vala	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace Spit.DataImports {
-
-/**
- * Photo source implementation for alien databases. This class is responsible
- * for extracting meta-data out of a source photo to support the import
- * process.
- *
- * This class does not extend PhotoSource in order to minimise the API to the
- * absolute minimum required to run the import job.
- */
-public class DataImportSource {
-    private bool backing_file_found;
-    private ImportableMediaItem db_photo;
-    private string? title = null;
-    private string? preview_md5 = null;
-    private uint64 file_size;
-    private time_t modification_time;
-    private MetadataDateTime? exposure_time;
-
-    public DataImportSource (ImportableMediaItem db_photo) {
-        this.db_photo = db_photo;
-
-        // A well-behaved plugin will ensure that the path and file name are
-        // not null but we check just in case
-        string folder_path = db_photo.get_folder_path ();
-        string filename = db_photo.get_filename ();
-        File? photo = null;
-        if (folder_path != null && filename != null) {
-            photo = File.new_for_path (db_photo.get_folder_path ()).
-                    get_child (db_photo.get_filename ());
-
-            backing_file_found = photo.query_exists ();
-        } else {
-            backing_file_found = false;
-        }
-
-        if (photo != null && backing_file_found) {
-            PhotoMetadata? metadata = new PhotoMetadata ();
-            try {
-                metadata.read_from_file (photo);
-            } catch (Error e) {
-                warning ("Could not get file metadata for %s: %s", get_filename (), e.message);
-                metadata = null;
-            }
-
-            title = (metadata != null) ? metadata.get_title () : null;
-            exposure_time = (metadata != null) ? metadata.get_exposure_date_time () : null;
-            PhotoPreview ? preview = metadata != null ? metadata.get_preview (0) : null;
-            if (preview != null) {
-                try {
-                    uint8[] preview_raw = preview.flatten ();
-                    preview_md5 = md5_binary (preview_raw, preview_raw.length);
-                } catch (Error e) {
-                    warning ("Could not get raw preview for %s: %s", get_filename (), e.message);
-                }
-            }
-#if TRACE_MD5
-            debug ("Photo MD5 %s: preview=%s", get_filename (), preview_md5);
-#endif
-
-            try {
-                file_size = query_total_file_size (photo);
-            } catch (Error e) {
-                warning ("Could not get file size for %s: %s", get_filename (), e.message);
-            }
-            try {
-                modification_time = query_file_modified (photo);
-            } catch (Error e) {
-                warning ("Could not get modification time for %s: %s", get_filename (), e.message);
-            }
-        } else {
-            debug ("Photo file %s not found".printf (photo.get_path ()));
-        }
-    }
-
-    public string get_filename () {
-        return db_photo.get_filename ();
-    }
-
-    public string get_fulldir () {
-        return db_photo.get_folder_path ();
-    }
-
-    public File get_file () {
-        return File.new_for_path (get_fulldir ()).get_child (get_filename ());
-    }
-
-    public string get_name () {
-        return !is_string_empty (title) ? title : get_filename ();
-    }
-
-    public string? get_title () {
-        return title;
-    }
-
-    public PhotoFileFormat get_file_format () {
-        return PhotoFileFormat.get_by_basename_extension (get_filename ());
-    }
-
-    public string to_string () {
-        return get_name ();
-    }
-
-    public time_t get_exposure_time () {
-        return (exposure_time != null) ? exposure_time.get_timestamp () : modification_time;
-    }
-
-    public uint64 get_filesize () {
-        return file_size;
-    }
-
-    public ImportableMediaItem get_photo () {
-        return db_photo;
-    }
-
-    public bool is_already_imported () {
-        // ignore trashed duplicates
-        return (preview_md5 != null)
-               ? LibraryPhoto.has_nontrash_duplicate (null, preview_md5, null, get_file_format ())
-               : false;
-    }
-
-    public bool was_backing_file_found () {
-        return backing_file_found;
-    }
-}
-
-}
-

=== removed file 'src/data_imports/DataImports.vala'
--- src/data_imports/DataImports.vala	2014-08-08 21:13:09 +0000
+++ src/data_imports/DataImports.vala	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-/* This file is the master unit file for the DataImports unit.  It should be edited to include
- * whatever code is deemed necessary.
- *
- * The init () and terminate () methods are mandatory.
- *
- * If the unit needs to be configured prior to initialization, add the proper parameters to
- * the preconfigure () method, implement it, and ensure in init () that it's been called.
- */
-
-namespace DataImports {
-
-public void init () throws Error {
-    string[] core_ids = new string[0];
-    core_ids += "org.yorba.shotwell.dataimports.fspot";
-
-    Plugins.register_extension_point (typeof (Spit.DataImports.Service), _ ("Data Imports"),
-    Resources.IMPORT, core_ids);
-}
-
-public void terminate () {
-}
-
-}
-

=== removed file 'src/data_imports/DataImportsPluginHost.vala'
--- src/data_imports/DataImportsPluginHost.vala	2014-08-08 21:13:09 +0000
+++ src/data_imports/DataImportsPluginHost.vala	1970-01-01 00:00:00 +0000
@@ -1,483 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace Spit.DataImports {
-
-private class CoreImporter {
-    private weak Spit.DataImports.PluginHost host;
-    public int imported_items_count = 0;
-    public BatchImportRoll? current_import_roll = null;
-
-    public CoreImporter (Spit.DataImports.PluginHost host) {
-        this.host = host;
-    }
-
-    public void prepare_media_items_for_import (
-        ImportableMediaItem[] items,
-        double progress,
-        double host_progress_delta = 0.0,
-        string? progress_message = null
-    ) {
-        host.update_import_progress_pane (progress, progress_message);
-        //
-        SortedList<DataImportJob> jobs =
-            new SortedList<DataImportJob> (import_job_comparator);
-        Gee.ArrayList<DataImportJob> already_imported =
-            new Gee.ArrayList<DataImportJob> ();
-        Gee.ArrayList<DataImportJob> failed =
-            new Gee.ArrayList<DataImportJob> ();
-
-        int item_idx = 0;
-        double item_progress_delta = host_progress_delta / items.length;
-        foreach (ImportableMediaItem src_item in items) {
-            DataImportSource import_source = new DataImportSource (src_item);
-
-            if (!import_source.was_backing_file_found ()) {
-                message ("Skipping import of %s: backing file not found",
-                         import_source.get_filename ());
-                failed.add (new DataImportJob (import_source));
-
-                continue;
-            }
-
-            if (import_source.is_already_imported ()) {
-                message ("Skipping import of %s: checksum detected in library",
-                         import_source.get_filename ());
-                already_imported.add (new DataImportJob (import_source));
-
-                continue;
-            }
-
-            jobs.add (new DataImportJob (import_source));
-            item_idx++;
-            host.update_import_progress_pane (progress + item_idx * item_progress_delta);
-        }
-
-        if (jobs.size > 0) {
-            // If there it no current import roll, create one to ensure that all
-            // imported items end up in the same roll even if this method is called
-            // several times
-            if (current_import_roll == null)
-                current_import_roll = new BatchImportRoll ();
-            string db_name = _ ("%s Database").printf (host.get_data_importer ().get_service ().get_pluggable_name ());
-            BatchImport batch_import = new BatchImport (jobs, db_name, data_import_reporter,
-                    failed, already_imported, null, current_import_roll);
-
-            LibraryWindow.get_app ().enqueue_batch_import (batch_import, true);
-            imported_items_count += jobs.size;
-        }
-
-        host.update_import_progress_pane (progress + host_progress_delta);
-    }
-
-    public void finalize_import () {
-        // Send an empty job to the queue to mark the end of the import
-        string db_name = _ ("%s Database").printf (host.get_data_importer ().get_service ().get_pluggable_name ());
-        BatchImport batch_import = new BatchImport (
-            new Gee.ArrayList<BatchImportJob> (), db_name, data_import_reporter, null, null, null, current_import_roll
-        );
-        LibraryWindow.get_app ().enqueue_batch_import (batch_import, true);
-        current_import_roll = null;
-    }
-}
-
-public class ConcreteDataImportsHost : Plugins.StandardHostInterface,
-    Spit.DataImports.PluginHost {
-
-    private Spit.DataImports.DataImporter active_importer = null;
-    private weak DataImportsUI.DataImportsDialog dialog = null;
-    private DataImportsUI.ProgressPane? progress_pane = null;
-    private bool importing_halted = false;
-    private CoreImporter core_importer;
-
-    public ConcreteDataImportsHost (Service service, DataImportsUI.DataImportsDialog dialog) {
-        base (service, "data_imports");
-        this.dialog = dialog;
-
-        this.active_importer = service.create_data_importer (this);
-        this.core_importer = new CoreImporter (this);
-    }
-
-    public DataImporter get_data_importer () {
-        return active_importer;
-    }
-
-    public void start_importing () {
-        if (get_data_importer ().is_running ())
-            return;
-
-        debug ("ConcreteDataImportsHost.start_importing( ): invoked.");
-
-        get_data_importer ().start ();
-    }
-
-    public void stop_importing () {
-        debug ("ConcreteDataImportsHost.stop_importing( ): invoked.");
-
-        if (get_data_importer ().is_running ())
-            get_data_importer ().stop ();
-
-        clean_up ();
-
-        importing_halted = true;
-    }
-
-    private void clean_up () {
-        progress_pane = null;
-    }
-
-    public void set_button_mode (Spit.DataImports.PluginHost.ButtonMode mode) {
-        if (mode == Spit.DataImports.PluginHost.ButtonMode.CLOSE)
-            dialog.set_close_button_mode ();
-        else if (mode == Spit.DataImports.PluginHost.ButtonMode.CANCEL)
-            dialog.set_cancel_button_mode ();
-        else
-            error ("unrecognized button mode enumeration value");
-    }
-
-    // Pane handling methods
-
-    public void post_error (Error err) {
-        post_error_message (err.message);
-    }
-
-    public void post_error_message (string message) {
-        string msg = _ ("Importing from %s can't continue because an error occurred:").printf (
-                         active_importer.get_service ().get_pluggable_name ());
-        msg += GLib.Markup.printf_escaped ("\n\n<i>%s</i>\n\n", message);
-        msg += _ ("To try importing from another service, select one from the above menu.");
-
-        dialog.install_pane (new DataImportsUI.StaticMessagePane.with_pango (msg));
-        dialog.set_close_button_mode ();
-        dialog.unlock_service ();
-
-        get_data_importer ().stop ();
-
-        // post_error_message( ) tells the active_importer to stop importing and displays a
-        // non-removable error pane that effectively ends the publishing interaction,
-        // so no problem calling clean_up( ) here.
-        clean_up ();
-    }
-
-    public void install_dialog_pane (Spit.DataImports.DialogPane pane,
-                                     Spit.DataImports.PluginHost.ButtonMode button_mode = Spit.DataImports.PluginHost.ButtonMode.CANCEL) {
-        debug ("DataImports.PluginHost: install_dialog_pane( ): invoked.");
-
-        if (get_data_importer () == null || (!get_data_importer ().is_running ()))
-            return;
-
-        dialog.install_pane (pane);
-
-        set_button_mode (button_mode);
-    }
-
-    public void install_static_message_pane (string message,
-            Spit.DataImports.PluginHost.ButtonMode button_mode = Spit.DataImports.PluginHost.ButtonMode.CANCEL) {
-
-        set_button_mode (button_mode);
-
-        dialog.install_pane (new DataImportsUI.StaticMessagePane.with_pango (message));
-    }
-
-    public void install_library_selection_pane (
-        string welcome_message,
-        ImportableLibrary[] discovered_libraries,
-        string? file_select_label
-    ) {
-        if (discovered_libraries.length == 0 && file_select_label == null)
-            post_error_message ("Libraries or file option needed");
-        else
-            dialog.install_pane (new DataImportsUI.LibrarySelectionPane (
-                                     this,
-                                     welcome_message,
-                                     discovered_libraries,
-                                     file_select_label
-                                 ));
-        set_button_mode (Spit.DataImports.PluginHost.ButtonMode.CLOSE);
-    }
-
-    public void install_import_progress_pane (
-        string message
-    ) {
-        progress_pane = new DataImportsUI.ProgressPane (message);
-        dialog.install_pane (progress_pane);
-        set_button_mode (Spit.DataImports.PluginHost.ButtonMode.CANCEL);
-        // initialize the import
-        core_importer.imported_items_count = 0;
-        core_importer.current_import_roll = null;
-    }
-
-    public void update_import_progress_pane (
-        double progress,
-        string? progress_message = null
-    ) {
-        if (progress_pane != null) {
-            progress_pane.update_progress (progress, progress_message);
-        }
-    }
-
-    public void prepare_media_items_for_import (
-        ImportableMediaItem[] items,
-        double progress,
-        double host_progress_delta = 0.0,
-        string? progress_message = null
-    ) {
-        core_importer.prepare_media_items_for_import (items, progress, host_progress_delta, progress_message);
-    }
-
-    public void finalize_import (
-        ImportedItemsCountCallback report_imported_items_count,
-        string? finalize_message = null
-    ) {
-        update_import_progress_pane (1.0, finalize_message);
-        set_button_mode (Spit.DataImports.PluginHost.ButtonMode.CLOSE);
-        core_importer.finalize_import ();
-        report_imported_items_count (core_importer.imported_items_count);
-        if (core_importer.imported_items_count > 0)
-            LibraryWindow.get_app ().switch_to_import_queue_page ();
-    }
-}
-
-public class WelcomeDataImportsHost : Plugins.StandardHostInterface,
-    Spit.DataImports.PluginHost {
-
-    private weak WelcomeImportMetaHost meta_host;
-    private Spit.DataImports.DataImporter active_importer = null;
-    private bool importing_halted = false;
-    private CoreImporter core_importer;
-
-    public WelcomeDataImportsHost (Service service, WelcomeImportMetaHost meta_host) {
-        base (service, "data_imports");
-
-        this.active_importer = service.create_data_importer (this);
-        this.core_importer = new CoreImporter (this);
-        this.meta_host = meta_host;
-    }
-
-    public DataImporter get_data_importer () {
-        return active_importer;
-    }
-
-    public void start_importing () {
-        if (get_data_importer ().is_running ())
-            return;
-
-        debug ("WelcomeDataImportsHost.start_importing( ): invoked.");
-
-        get_data_importer ().start ();
-    }
-
-    public void stop_importing () {
-        debug ("WelcomeDataImportsHost.stop_importing( ): invoked.");
-
-        if (get_data_importer ().is_running ())
-            get_data_importer ().stop ();
-
-        clean_up ();
-
-        importing_halted = true;
-    }
-
-    private void clean_up () {
-    }
-
-    // Pane handling methods
-
-    public void post_error (Error err) {
-        post_error_message (err.message);
-    }
-
-    public void post_error_message (string message) {
-        string msg = _ ("Importing from %s can't continue because an error occurred:").printf (
-                         active_importer.get_service ().get_pluggable_name ());
-
-        debug (msg);
-
-        get_data_importer ().stop ();
-
-        // post_error_message( ) tells the active_importer to stop importing and displays a
-        // non-removable error pane that effectively ends the publishing interaction,
-        // so no problem calling clean_up( ) here.
-        clean_up ();
-    }
-
-    public void install_dialog_pane (Spit.DataImports.DialogPane pane,
-                                     Spit.DataImports.PluginHost.ButtonMode button_mode = Spit.DataImports.PluginHost.ButtonMode.CANCEL) {
-        // do nothing
-    }
-
-    public void install_static_message_pane (string message,
-            Spit.DataImports.PluginHost.ButtonMode button_mode = Spit.DataImports.PluginHost.ButtonMode.CANCEL) {
-        // do nothing
-    }
-
-    public void install_library_selection_pane (
-        string welcome_message,
-        ImportableLibrary[] discovered_libraries,
-        string? file_select_label
-    ) {
-        debug ("WelcomeDataImportsHost: Installing library selection pane for %s".printf (get_data_importer ().get_service ().get_pluggable_name ()));
-        if (discovered_libraries.length > 0) {
-            meta_host.install_service_entry (new WelcomeImportServiceEntry (
-                                                 this,
-                                                 get_data_importer ().get_service ().get_pluggable_name (),
-                                                 discovered_libraries
-                                             ));
-        }
-    }
-
-    public void install_import_progress_pane (
-        string message
-    ) {
-        // empty implementation
-    }
-
-    public void update_import_progress_pane (
-        double progress,
-        string? progress_message = null
-    ) {
-        // empty implementation
-    }
-
-    public void prepare_media_items_for_import (
-        ImportableMediaItem[] items,
-        double progress,
-        double host_progress_delta = 0.0,
-        string? progress_message = null
-    ) {
-        core_importer.prepare_media_items_for_import (items, progress, host_progress_delta, progress_message);
-    }
-
-    public void finalize_import (
-        ImportedItemsCountCallback report_imported_items_count,
-        string? finalize_message = null
-    ) {
-        core_importer.finalize_import ();
-        report_imported_items_count (core_importer.imported_items_count);
-        meta_host.finalize_import (this);
-    }
-}
-
-
-//public delegate void WelcomeImporterCallback ();
-
-public class WelcomeImportServiceEntry : GLib.Object, WelcomeServiceEntry {
-    private string pluggable_name;
-    private ImportableLibrary[] discovered_libraries;
-    private Spit.DataImports.PluginHost host;
-
-    public WelcomeImportServiceEntry (
-        Spit.DataImports.PluginHost host,
-        string pluggable_name, ImportableLibrary[] discovered_libraries) {
-
-        this.host = host;
-        this.pluggable_name = pluggable_name;
-        this.discovered_libraries = discovered_libraries;
-    }
-
-    public string get_service_name () {
-        return pluggable_name;
-    }
-
-    public void execute () {
-        foreach (ImportableLibrary library in discovered_libraries) {
-            host.get_data_importer ().on_library_selected (library);
-        }
-    }
-}
-
-public class WelcomeImportMetaHost : GLib.Object {
-    private WelcomeDialog dialog;
-
-    public WelcomeImportMetaHost (WelcomeDialog dialog) {
-        this.dialog = dialog;
-    }
-
-    public void start () {
-        Service[] services = load_all_services ();
-        foreach (Service service in services) {
-            WelcomeDataImportsHost host = new WelcomeDataImportsHost (service, this);
-            host.start_importing ();
-        }
-    }
-
-    public void finalize_import (WelcomeDataImportsHost host) {
-        host.stop_importing ();
-    }
-
-    public void install_service_entry (WelcomeServiceEntry entry) {
-        debug ("WelcomeImportMetaHost: Installing service entry for %s".printf (entry.get_service_name ()));
-        dialog.install_service_entry (entry);
-    }
-}
-
-public static Spit.DataImports.Service[] load_all_services () {
-    return load_services (true);
-}
-
-public static Spit.DataImports.Service[] load_services (bool load_all = false) {
-    Spit.DataImports.Service[] loaded_services = new Spit.DataImports.Service[0];
-
-    // load publishing services from plug-ins
-    Gee.Collection<Spit.Pluggable> pluggables = Plugins.get_pluggables_for_type (
-                typeof (Spit.DataImports.Service), null, load_all);
-    // TODO: include sorting function to ensure consistent order
-
-    debug ("DataImportsDialog: discovered %d pluggable data import services.", pluggables.size);
-
-    foreach (Spit.Pluggable pluggable in pluggables) {
-        int pluggable_interface = pluggable.get_pluggable_interface (
-                                      Spit.DataImports.CURRENT_INTERFACE, Spit.DataImports.CURRENT_INTERFACE);
-        if (pluggable_interface != Spit.DataImports.CURRENT_INTERFACE) {
-            warning ("Unable to load data import plugin %s: reported interface %d.",
-                     Plugins.get_pluggable_module_id (pluggable), pluggable_interface);
-
-            continue;
-        }
-
-        Spit.DataImports.Service service =
-            (Spit.DataImports.Service) pluggable;
-
-        debug ("DataImportsDialog: discovered pluggable data import service '%s'.",
-               service.get_pluggable_name ());
-
-        loaded_services += service;
-    }
-
-    // Sort import services by name.
-    // TODO: extract to a function to sort it on initial request
-    Posix.qsort (loaded_services, loaded_services.length, sizeof (Spit.DataImports.Service),
-    (a, b) => {
-        return utf8_cs_compare ((* ((Spit.DataImports.Service **) a))->get_pluggable_name (),
-                                (* ((Spit.DataImports.Service **) b))->get_pluggable_name ());
-    });
-
-    return loaded_services;
-}
-
-private ImportManifest? meta_manifest = null;
-
-private void data_import_reporter (ImportManifest manifest, BatchImportRoll import_roll) {
-    if (manifest.all.size > 0) {
-        if (meta_manifest == null)
-            meta_manifest = new ImportManifest ();
-        foreach (BatchImportResult result in manifest.all) {
-            meta_manifest.add_result (result);
-        }
-    } else {
-        DataImportsUI.DataImportsDialog.terminate_instance ();
-        ImportUI.report_manifest (meta_manifest, true);
-        meta_manifest = null;
-    }
-}
-
-private int64 import_job_comparator (void *a, void *b) {
-    return ((DataImportJob *) a)->get_exposure_time ()
-           - ((DataImportJob *) b)->get_exposure_time ();
-}
-
-}
-

=== removed file 'src/data_imports/DataImportsUI.vala'
--- src/data_imports/DataImportsUI.vala	2014-08-08 21:13:09 +0000
+++ src/data_imports/DataImportsUI.vala	1970-01-01 00:00:00 +0000
@@ -1,445 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-namespace DataImportsUI {
-
-internal const string NO_PLUGINS_ENABLED_MESSAGE =
-    _ ("You do not have any data imports plugins enabled.\n\nIn order to use the Import From Application functionality, you need to have at least one data imports plugin enabled. Plugins can be enabled in the Preferences dialog.");
-
-public class ConcreteDialogPane : Spit.DataImports.DialogPane, GLib.Object {
-    private Gtk.Box pane_widget;
-
-    public ConcreteDialogPane () {
-        pane_widget = new Gtk.Box (Gtk.Orientation.VERTICAL, 8);
-    }
-
-    public Gtk.Widget get_widget () {
-        return pane_widget;
-    }
-
-    public Spit.DataImports.DialogPane.GeometryOptions get_preferred_geometry () {
-        return Spit.DataImports.DialogPane.GeometryOptions.NONE;
-    }
-
-    public void on_pane_installed () {
-    }
-
-    public void on_pane_uninstalled () {
-    }
-}
-
-public class StaticMessagePane : ConcreteDialogPane {
-    public StaticMessagePane (string message_string) {
-        Gtk.Label message_label = new Gtk.Label (message_string);
-        (get_widget () as Gtk.Box).pack_start (message_label, true, true, 0);
-    }
-
-    public StaticMessagePane.with_pango (string msg) {
-        Gtk.Label label = new Gtk.Label (null);
-        label.set_markup (msg);
-        label.set_line_wrap (true);
-
-        (get_widget () as Gtk.Box).pack_start (label, true, true, 0);
-    }
-}
-
-public class LibrarySelectionPane : ConcreteDialogPane {
-    private weak Spit.DataImports.PluginHost host;
-    private Spit.DataImports.ImportableLibrary? selected_library = null;
-    private File? selected_file = null;
-    private Gtk.Button import_button;
-    private Gtk.RadioButton? file_radio = null;
-
-    public LibrarySelectionPane (
-        Spit.DataImports.PluginHost host,
-        string welcome_message,
-        Spit.DataImports.ImportableLibrary[] discovered_libraries,
-        string? file_select_label
-    ) {
-        assert (discovered_libraries.length > 0 || on_file_selected != null);
-
-        this.host = host;
-
-        Gtk.Box content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 8);
-        content_box.set_margin_left (30);
-        content_box.set_margin_right (30);
-        Gtk.Label welcome_label = new Gtk.Label (null);
-        welcome_label.set_markup (welcome_message);
-        welcome_label.set_line_wrap (true);
-        welcome_label.set_halign (Gtk.Align.START);
-        content_box.pack_start (welcome_label, true, true, 6);
-
-        // margins for buttons
-        int radio_margin_left = 20;
-        int radio_margin_right = 20;
-        int chooser_margin_left = radio_margin_left;
-        int chooser_margin_right = radio_margin_right;
-
-        Gtk.RadioButton lib_radio = null;
-        if (discovered_libraries.length > 0) {
-            chooser_margin_left = radio_margin_left + 20;
-            foreach (Spit.DataImports.ImportableLibrary library in discovered_libraries) {
-                string lib_radio_label = library.get_display_name ();
-                lib_radio = create_radio_button (
-                                content_box, lib_radio, library, lib_radio_label,
-                                radio_margin_left, radio_margin_right
-                            );
-            }
-            if (file_select_label != null) {
-                lib_radio = create_radio_button (
-                                content_box, lib_radio, null, file_select_label,
-                                radio_margin_left, radio_margin_right
-                            );
-                file_radio = lib_radio;
-            }
-        }
-        if (file_select_label != null) {
-            Gtk.FileChooserButton file_chooser = new Gtk.FileChooserButton (_ ("Database file:"), Gtk.FileChooserAction.OPEN);
-            file_chooser.selection_changed.connect ( () => {
-                selected_file = file_chooser.get_file ();
-                if (file_radio != null)
-                    file_radio.active = true;
-                set_import_button_sensitivity ();
-            });
-            file_chooser.set_margin_left (chooser_margin_left);
-            file_chooser.set_margin_right (chooser_margin_right);
-            content_box.pack_start (file_chooser, false, false, 6);
-        }
-
-        import_button = new Gtk.Button.with_mnemonic (_ ("_Import"));
-        import_button.clicked.connect ( () => {
-            if (selected_library != null)
-                on_library_selected (selected_library);
-            else if (selected_file != null)
-                on_file_selected (selected_file);
-            else
-                debug ("LibrarySelectionPane: Library or file should be selected.");
-        });
-        Gtk.ButtonBox button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-        button_box.layout_style = Gtk.ButtonBoxStyle.CENTER;
-        button_box.add (import_button);
-        content_box.pack_end (button_box, true, false, 6);
-
-        (get_widget () as Gtk.Box).pack_start (content_box, true, true, 0);
-
-        set_import_button_sensitivity ();
-    }
-
-    private Gtk.RadioButton create_radio_button (
-        Gtk.Box box, Gtk.RadioButton? group, Spit.DataImports.ImportableLibrary? library, string label,
-        int margin_left, int margin_right
-    ) {
-        var button = new Gtk.RadioButton.with_label_from_widget (group, label);
-        if (group == null) { // first radio button is active
-            button.active = true;
-            selected_library = library;
-        }
-        button.toggled.connect ( () => {
-            if (button.active) {
-                this.selected_library = library;
-                set_import_button_sensitivity ();
-            }
-
-        });
-        button.set_margin_left (margin_left);
-        button.set_margin_right (margin_right);
-        box.pack_start (button, false, false, 6);
-        return button;
-    }
-
-    private void set_import_button_sensitivity () {
-        import_button.set_sensitive (selected_library != null || selected_file != null);
-    }
-
-    private void on_library_selected (Spit.DataImports.ImportableLibrary library) {
-        host.get_data_importer ().on_library_selected (library);
-    }
-
-    private void on_file_selected (File file) {
-        host.get_data_importer ().on_file_selected (file);
-    }
-}
-
-public class ProgressPane : ConcreteDialogPane {
-    private Gtk.Label message_label;
-    private Gtk.Label progress_label;
-    private Gtk.ProgressBar progress_bar;
-
-    public ProgressPane (string message) {
-        Gtk.Box content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 8);
-        message_label = new Gtk.Label (message);
-        content_box.pack_start (message_label, true, true, 6);
-        progress_bar = new Gtk.ProgressBar ();
-        content_box.pack_start (progress_bar, false, true, 6);
-        progress_label = new Gtk.Label ("");
-        content_box.pack_start (progress_label, false, true, 6);
-
-        (get_widget () as Gtk.Container).add (content_box);
-    }
-
-    public void update_progress (double progress, string? progress_message) {
-        progress_bar.set_fraction (progress);
-        if (progress_message != null)
-            progress_label.set_label (progress_message);
-        spin_event_loop ();
-    }
-}
-
-public class DataImportsDialog : Gtk.Dialog {
-    private const int LARGE_WINDOW_WIDTH = 860;
-    private const int LARGE_WINDOW_HEIGHT = 688;
-    private const int COLOSSAL_WINDOW_WIDTH = 1024;
-    private const int COLOSSAL_WINDOW_HEIGHT = 688;
-    private const int STANDARD_WINDOW_WIDTH = 600;
-    private const int STANDARD_WINDOW_HEIGHT = 510;
-    private const int BORDER_REGION_WIDTH = 16;
-    private const int BORDER_REGION_HEIGHT = 100;
-
-    public const int STANDARD_CONTENT_LABEL_WIDTH = 500;
-    public const int STANDARD_ACTION_BUTTON_WIDTH = 128;
-
-    private Gtk.ComboBoxText service_selector_box;
-    private Gtk.Label service_selector_box_label;
-    private Gtk.Box central_area_layouter;
-    private Gtk.Button close_cancel_button;
-    private Spit.DataImports.DialogPane active_pane;
-    private Spit.DataImports.ConcreteDataImportsHost host;
-
-    protected DataImportsDialog () {
-
-        resizable = false;
-        delete_event.connect (on_window_close);
-
-        string title = _ ("Import From Application");
-        string label = _ ("Import media _from:");
-
-        set_title (title);
-
-        Spit.DataImports.Service[] loaded_services = Spit.DataImports.load_services ();
-
-        if (loaded_services.length > 0) {
-            // Install the service selector part only if there is at least one
-            // service to select from
-            service_selector_box = new Gtk.ComboBoxText ();
-            service_selector_box.set_active (0);
-            service_selector_box_label = new Gtk.Label.with_mnemonic (label);
-            service_selector_box_label.set_mnemonic_widget (service_selector_box);
-            service_selector_box_label.set_alignment (0.0f, 0.5f);
-
-            // get the name of the service the user last used
-            string? last_used_service = Config.Facade.get_instance ().get_last_used_dataimports_service ();
-
-            int ticker = 0;
-            int last_used_index = -1;
-            foreach (Spit.DataImports.Service service in loaded_services) {
-                string curr_service_id = service.get_id ();
-                if (last_used_service != null && last_used_service == curr_service_id)
-                    last_used_index = ticker;
-
-                service_selector_box.append_text (service.get_pluggable_name ());
-                ticker++;
-            }
-            if (last_used_index >= 0)
-                service_selector_box.set_active (last_used_index);
-            else
-                service_selector_box.set_active (0);
-
-            service_selector_box.changed.connect (on_service_changed);
-
-            /* the wrapper is not an extraneous widget -- it's necessary to prevent the service
-               selection box from growing and shrinking whenever its parent's size changes.
-               When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
-               the service selection box. */
-            Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment (1.0f, 0.5f, 0.0f, 0.0f);
-            service_selector_box_wrapper.add (service_selector_box);
-
-            Gtk.Box service_selector_layouter = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 8);
-            service_selector_layouter.set_border_width (12);
-            service_selector_layouter.add (service_selector_box_label);
-            service_selector_layouter.pack_start (service_selector_box_wrapper, true, true, 0);
-
-            /* 'service area' is the selector assembly plus the horizontal rule dividing it from the
-               rest of the dialog */
-            Gtk.Box service_area_layouter = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            service_area_layouter.pack_start (service_selector_layouter, true, true, 0);
-            Gtk.Separator service_central_separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
-            service_area_layouter.add (service_central_separator);
-
-            Gtk.Alignment service_area_wrapper = new Gtk.Alignment (0.0f, 0.0f, 1.0f, 0.0f);
-            service_area_wrapper.add (service_area_layouter);
-
-            ((Gtk.Box) get_content_area ()).pack_start (service_area_wrapper, false, false, 0);
-        }
-
-        // Intall the central area in all cases
-        central_area_layouter = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        ((Gtk.Box) get_content_area ()).pack_start (central_area_layouter, true, true, 0);
-
-        close_cancel_button = new Gtk.Button.with_mnemonic ("_Cancel");
-        close_cancel_button.set_can_default (true);
-        close_cancel_button.clicked.connect (on_close_cancel_clicked);
-        ((Gtk.Box) get_action_area ()).add (close_cancel_button);
-
-        set_standard_window_mode ();
-
-        if (loaded_services.length > 0) {
-            // trigger the selected service if at least one service is available
-            on_service_changed ();
-        } else {
-            // otherwise, install a message pane advising the user what to do
-            install_pane (new StaticMessagePane.with_pango (NO_PLUGINS_ENABLED_MESSAGE));
-            set_close_button_mode ();
-        }
-
-        show_all ();
-    }
-
-    public static DataImportsDialog get_or_create_instance () {
-        if (instance == null) {
-            instance = new DataImportsDialog ();
-        }
-        return instance;
-    }
-
-    public static void terminate_instance () {
-        if (instance != null) {
-            instance.terminate ();
-        }
-        instance = null;
-    }
-
-    private bool on_window_close (Gdk.EventAny evt) {
-        debug ("DataImportsDialog: on_window_close( ): invoked.");
-        terminate ();
-
-        return true;
-    }
-
-    private void on_service_changed () {
-        debug ("DataImportsDialog: on_service_changed invoked.");
-        string service_name = service_selector_box.get_active_text ();
-
-        Spit.DataImports.Service? selected_service = null;
-        Spit.DataImports.Service[] services = Spit.DataImports.load_all_services ();
-        foreach (Spit.DataImports.Service service in services) {
-            if (service.get_pluggable_name () == service_name) {
-                selected_service = service;
-                break;
-            }
-        }
-        assert (selected_service != null);
-
-        Config.Facade.get_instance ().set_last_used_dataimports_service (selected_service.get_id ());
-
-        host = new Spit.DataImports.ConcreteDataImportsHost (selected_service, this);
-        host.start_importing ();
-    }
-
-    private void on_close_cancel_clicked () {
-        debug ("DataImportsDialog: on_close_cancel_clicked( ): invoked.");
-
-        terminate ();
-    }
-
-    private void terminate () {
-        debug ("DataImportsDialog: terminate( ): invoked.");
-
-        if (host != null) {
-            host.stop_importing ();
-            host = null;
-        }
-
-        hide ();
-        destroy ();
-        instance = null;
-    }
-
-    private void set_large_window_mode () {
-        set_size_request (LARGE_WINDOW_WIDTH, LARGE_WINDOW_HEIGHT);
-        central_area_layouter.set_size_request (LARGE_WINDOW_WIDTH - BORDER_REGION_WIDTH,
-                                                LARGE_WINDOW_HEIGHT - BORDER_REGION_HEIGHT);
-        resizable = false;
-    }
-
-    private void set_colossal_window_mode () {
-        set_size_request (COLOSSAL_WINDOW_WIDTH, COLOSSAL_WINDOW_HEIGHT);
-        central_area_layouter.set_size_request (COLOSSAL_WINDOW_WIDTH - BORDER_REGION_WIDTH,
-                                                COLOSSAL_WINDOW_HEIGHT - BORDER_REGION_HEIGHT);
-        resizable = false;
-    }
-
-    private void set_standard_window_mode () {
-        set_size_request (STANDARD_WINDOW_WIDTH, STANDARD_WINDOW_HEIGHT);
-        central_area_layouter.set_size_request (STANDARD_WINDOW_WIDTH - BORDER_REGION_WIDTH,
-                                                STANDARD_WINDOW_HEIGHT - BORDER_REGION_HEIGHT);
-        resizable = false;
-    }
-
-    private void set_free_sizable_window_mode () {
-        resizable = true;
-    }
-
-    private void clear_free_sizable_window_mode () {
-        resizable = false;
-    }
-
-    public Spit.DataImports.DialogPane get_active_pane () {
-        return active_pane;
-    }
-
-    public void set_close_button_mode () {
-        close_cancel_button.set_label (_ ("_Close"));
-        set_default (close_cancel_button);
-    }
-
-    public void set_cancel_button_mode () {
-        close_cancel_button.set_label (_ ("_Cancel"));
-    }
-
-    public void lock_service () {
-        service_selector_box.set_sensitive (false);
-    }
-
-    public void unlock_service () {
-        service_selector_box.set_sensitive (true);
-    }
-
-    public void install_pane (Spit.DataImports.DialogPane pane) {
-        debug ("DataImportsDialog: install_pane( ): invoked.");
-
-        if (active_pane != null) {
-            debug ("DataImportsDialog: install_pane( ): a pane is already installed; removing it.");
-
-            active_pane.on_pane_uninstalled ();
-            central_area_layouter.remove (active_pane.get_widget ());
-        }
-
-        central_area_layouter.pack_start (pane.get_widget (), true, true, 0);
-        show_all ();
-
-        Spit.DataImports.DialogPane.GeometryOptions geometry_options =
-            pane.get_preferred_geometry ();
-        if ((geometry_options & Spit.Publishing.DialogPane.GeometryOptions.EXTENDED_SIZE) != 0)
-            set_large_window_mode ();
-        else if ((geometry_options & Spit.Publishing.DialogPane.GeometryOptions.COLOSSAL_SIZE) != 0)
-            set_colossal_window_mode ();
-        else
-            set_standard_window_mode ();
-
-        if ((geometry_options & Spit.Publishing.DialogPane.GeometryOptions.RESIZABLE) != 0)
-            set_free_sizable_window_mode ();
-        else
-            clear_free_sizable_window_mode ();
-
-        active_pane = pane;
-        pane.on_pane_installed ();
-    }
-
-    private static DataImportsDialog? instance;
-}
-
-}
-

=== removed directory 'src/data_imports/mk'
=== removed file 'src/data_imports/mk/data_imports.mk'
--- src/data_imports/mk/data_imports.mk	2012-02-02 22:56:06 +0000
+++ src/data_imports/mk/data_imports.mk	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-
-# UNIT_NAME is the Vala namespace.  A file named UNIT_NAME.vala must be in this directory with
-# a init() and terminate() function declared in the namespace.
-UNIT_NAME := DataImports
-
-# UNIT_DIR should match the subdirectory the files are located in.  Generally UNIT_NAME in all
-# lowercase.  The name of this file should be UNIT_DIR.mk.
-UNIT_DIR := data_imports
-
-# All Vala files in the unit should be listed here with no subdirectory prefix.
-#
-# NOTE: Do *not* include the unit's master file, i.e. UNIT_NAME.vala.
-UNIT_FILES := \
-	DataImportsPluginHost.vala \
-	DataImportsUI.vala \
-	DataImportJob.vala \
-	DataImportSource.vala
-
-# Any unit this unit relies upon (and should be initialized before it's initialized) should
-# be listed here using its Vala namespace.
-#
-# NOTE: All units are assumed to rely upon the unit-unit.  Do not include that here.
-UNIT_USES :=
-
-# List any additional files that are used in the build process as a part of this unit that should
-# be packaged in the tarball.  File names should be relative to the unit's home directory.
-UNIT_RC :=
-
-# unitize.mk must be called at the end of each UNIT_DIR.mk file.
-include unitize.mk
-

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2014-08-28 03:37:44 +0000
+++ src/library/LibraryWindow.vala	2014-08-28 06:03:26 +0000
@@ -288,13 +288,6 @@
         import.tooltip = _ ("Import photos from disk to library");
         actions += import;
 
-        Gtk.ActionEntry import_from_external = {
-            "ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE,
-            null, TRANSLATABLE, on_external_library_import
-        };
-        import_from_external.label = _ ("Import From _Application...");
-        actions += import_from_external;
-
         Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
         sort.label = _ ("Sort _Events");
         actions += sort;
@@ -667,12 +660,6 @@
         import_dialog.destroy ();
     }
 
-    private void on_external_library_import () {
-        Gtk.Dialog import_dialog = DataImportsUI.DataImportsDialog.get_or_create_instance ();
-
-        import_dialog.run ();
-    }
-
     protected override void update_common_action_availability (Page? old_page, Page? new_page) {
         base.update_common_action_availability (old_page, new_page);
 

=== modified file 'src/library/mk/library.mk'
--- src/library/mk/library.mk	2014-08-28 03:37:44 +0000
+++ src/library/mk/library.mk	2014-08-28 06:03:26 +0000
@@ -41,8 +41,7 @@
 	Events \
 	Tags \
 	Camera \
-	Searches \
-	DataImports
+	Searches
 
 # List any additional files that are used in the build process as a part of this unit that should
 # be packaged in the tarball.  File names should be relative to the unit's home directory.

=== removed file 'src/plugins/DataImportsInterfaces.vala'
--- src/plugins/DataImportsInterfaces.vala	2014-08-08 21:13:09 +0000
+++ src/plugins/DataImportsInterfaces.vala	1970-01-01 00:00:00 +0000
@@ -1,489 +0,0 @@
-/* Copyright 2011-2013 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.
- */
-
-/**
- * Shotwell Pluggable Data Imports API
- *
- * The Shotwell Pluggable Data Imports API allows you to write plugins that import
- * information from other media library databases to help migration to Shotwell.
- * The Shotwell distribution includes import support for F-Spot.
- * To enable Shotwell to import from additional libaries, developers like you write
- * data import plugins, dynamically-loadable shared objects that are linked into the
- * Shotwell process at runtime. Data import plugins are just one of several kinds of
- * plugins supported by {@link Spit}, the Shotwell Pluggable Interfaces Technology.
- */
-namespace Spit.DataImports {
-
-/**
- * The current version of the Pluggable Data Import API
- */
-public const int CURRENT_INTERFACE = 0;
-
-/**
- * The error domain for alien databases
- */
-public errordomain DataImportError {
-    /**
-     * Indicates that the version of the external database being imported is
-     * not supported by this version of the plugin.
-     *
-     * This occurs for example when trying to import an F-Spot database that
-     * has a version that is more recent than what the current plugin supports.
-     */
-    UNSUPPORTED_VERSION
-}
-
-/**
- * Represents a module that is able to import data from a specific database format.
- *
- * Developers of data import plugins provide a class that implements this interface. At
- * any given time, only one DataImporter can be running. When a data importer is running, it
- * has exclusive use of the shared user-interface and
- * configuration services provided by the {@link PluginHost}. Data importers are created in
- * a non-running state and do not begin running until start( ) is invoked. Data importers
- * run until stop( ) is invoked.
- */
-public interface DataImporter : GLib.Object {
-    /**
-     * Returns a {@link Service} object describing the service to which this connects.
-     */
-    public abstract Service get_service ();
-
-    /**
-     * Makes this data importer enter the running state and endows it with exclusive access
-     * to the shared services provided by the {@link PluginHost}. Through the host’s interface,
-     * this data importer can install user interface panes and query configuration information.
-     */
-    public abstract void start ();
-
-    /**
-     * Returns true if this data importer is in the running state; false otherwise.
-     */
-    public abstract bool is_running ();
-
-    /**
-     * Causes this data importer to enter a non-running state. This data importer should stop all
-     * data access operations and cease use of the shared services provided by the {@link PluginHost}.
-     */
-    public abstract void stop ();
-
-    /**
-     * Causes this data importer to enter start the import of a library.
-     */
-    public abstract void on_library_selected (ImportableLibrary library);
-
-    /**
-     * Causes this data importer to enter start the import of a library file.
-     */
-    public abstract void on_file_selected (File file);
-
-    //
-    // For future expansion.
-    //
-    protected virtual void reserved0 () {}
-    protected virtual void reserved1 () {}
-    protected virtual void reserved2 () {}
-    protected virtual void reserved3 () {}
-    protected virtual void reserved4 () {}
-    protected virtual void reserved5 () {}
-    protected virtual void reserved6 () {}
-    protected virtual void reserved7 () {}
-}
-
-/**
- * Represents a library of importable media items.
- *
- * Developers of data import plugins provide a class that implements this interface.
- */
-public interface ImportableLibrary : GLib.Object {
-    public abstract string get_display_name ();
-}
-
-/**
- * Represents an importable media item such as a photo or a video file.
- *
- * Developers of data import plugins provide a class that implements this interface.
- */
-public interface ImportableMediaItem : GLib.Object {
-    public abstract ImportableTag[] get_tags ();
-
-    public abstract ImportableEvent? get_event ();
-
-    public abstract ImportableRating get_rating ();
-
-    public abstract string? get_title ();
-
-    public abstract string get_folder_path ();
-
-    public abstract string get_filename ();
-}
-
-/**
- * Represents an importable tag.
- *
- * Developers of data import plugins provide a class that implements this interface.
- */
-public interface ImportableTag : GLib.Object {
-    public abstract string get_name ();
-
-    public abstract ImportableTag? get_parent ();
-}
-
-/**
- * Represents an importable event.
- *
- * Developers of data import plugins provide a class that implements this interface.
- */
-public interface ImportableEvent : GLib.Object {
-    public abstract string get_name ();
-}
-
-/**
- * Represents an importable rating value.
- *
- * Developers of data import plugins provide a class that implements this interface.
- * Note that the value returned by the get_value method should be a value between
- * 1 and 5, unless the rating object is unrated or rejected, in which case the
- * value is unspecified.
- */
-public interface ImportableRating : GLib.Object {
-    public abstract bool is_unrated ();
-
-    public abstract bool is_rejected ();
-
-    public abstract int get_value ();
-}
-
-/**
- * Encapsulates a pane that can be installed in the on-screen import dialog box to
- * communicate status to and to get information from the user.
- *
- */
-public interface DialogPane : GLib.Object {
-
-    /**
-     * Describes how the on-screen publishing dialog box should look and behave when an associated
-     * pane is installed in the on-screen publishing dialog box.
-     */
-    public enum GeometryOptions {
-
-        /**
-         * When the associated pane is installed, the on-screen publishing dialog box will be
-         * sized normally and will not allow the user to change its size.
-         */
-        NONE =          0,
-
-        /**
-         * If this bit is set, when the associated pane is installed, the on-screen publishing
-         * dialog box will grow to a larger size.
-         */
-        EXTENDED_SIZE = 1 << 0,
-
-        /**
-         * If this bit is set, when the associated pane is installed, the on-screen publishing
-         * dialog box will allow the user to change its size.
-         */
-        RESIZABLE =     1 << 1,
-
-        /**
-         * If this bit is set, when the associated pane is installed, the on-screen publishing
-         * dialog box will grow to accommodate a full-width 1024 pixel web page. If both
-         * EXTENDED_SIZE and COLOSSAL_SIZE are set, EXTENDED_SIZE takes precedence.
-         */
-        COLOSSAL_SIZE = 1 << 2;
-    }
-
-    /**
-     * Returns the Gtk.Widget that is this pane's on-screen representation.
-     */
-    public abstract Gtk.Widget get_widget ();
-
-    /**
-     * Returns a {@link GeometryOptions} bitfield describing how the on-screen publishing dialog
-     * box should look and behave when this pane is installed.
-     */
-    public abstract GeometryOptions get_preferred_geometry ();
-
-    /**
-     * Invoked automatically by Shotwell when this pane has been installed into the on-screen
-     * publishing dialog box and become visible to the user.
-     */
-    public abstract void on_pane_installed ();
-
-    /**
-     * Invoked automatically by Shotwell when this pane has been removed from the on-screen
-     * publishing dialog box and is no longer visible to the user.
-     */
-    public abstract void on_pane_uninstalled ();
-
-    //
-    // For future expansion.
-    //
-    protected virtual void reserved0 () {}
-    protected virtual void reserved1 () {}
-    protected virtual void reserved2 () {}
-    protected virtual void reserved3 () {}
-    protected virtual void reserved4 () {}
-    protected virtual void reserved5 () {}
-    protected virtual void reserved6 () {}
-    protected virtual void reserved7 () {}
-}
-
-/**
- * Called by the data imports system at the end of an import batch to report
- * to the plugin the number of items that were really imported. This enables
- * the plugin to display a final message to the user. However, the plugin
- * should not rely on this callback being called in order to clean up.
- */
-public delegate void ImportedItemsCountCallback (int imported_items_count);
-
-/**
- * Manages and provides services for data import plugins.
- *
- * Implemented inside Shotwell, the PluginHost provides an interface through which the
- * developers of data import plugins can query and make changes to the import
- * environment. Plugins can use the services of the PluginHost only when their
- * {@link DataImporter} is in the running state. This ensures that non-running data importers
- * don’t destructively interfere with the actively running importer.
- */
-public interface PluginHost : GLib.Object, Spit.HostInterface {
-
-    /**
-     * Specifies the label text on the push button control that appears in the
-     * lower-right-hand corner of the on-screen publishing dialog box.
-     */
-    public enum ButtonMode {
-        CLOSE = 0,
-        CANCEL = 1
-    }
-
-    /**
-     * Notifies the user that an unrecoverable import error has occurred and halts
-     * the import process.
-     *
-     * @param err An error object that describes the kind of error that occurred.
-     */
-    public abstract void post_error (Error err);
-
-    /**
-     * Notifies the user that an unrecoverable import error has occurred and halts
-     * the import process.
-     *
-     * @param msg A message that describes the kind of error that occurred.
-     */
-    public abstract void post_error_message (string msg);
-
-    /**
-     * Starts the import process.
-     *
-     * Calling this method starts the import activity for this host.
-     */
-    public abstract void start_importing ();
-
-    /**
-     * Halts the import process.
-     *
-     * Calling this method stops all import activity and hides the on-screen import
-     * dialog box.
-     */
-    public abstract void stop_importing ();
-
-    /**
-     * Returns a reference to the {@link DataImporter} object that this is currently hosting.
-     */
-    public abstract DataImporter get_data_importer ();
-
-    /**
-     * Attempts to install a pane in the on-screen data import dialog box, making the pane visible
-     * and allowing it to interact with the user.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param pane the pane to install
-     *
-     * @param mode allows you to set the text displayed on the close/cancel button in the
-     * lower-right-hand corner of the on-screen data import dialog box when pane is installed.
-     * If mode is ButtonMode.CLOSE, the button will have the title "Close." If mode is
-     * ButtonMode.CANCEL, the button will be titled "Cancel." You should set mode depending on
-     * whether a cancellable action is in progress. For example, if your importer is in the
-     * middle of processing 3 of 8 videos, then mode should be ButtonMode.CANCEL. However, if
-     * the processing operation has completed and the success pane is displayed, then mode
-     * should be ButtonMode.CLOSE, because all cancellable actions have already
-     * occurred.
-     */
-    public abstract void install_dialog_pane (Spit.DataImports.DialogPane pane,
-            ButtonMode mode = ButtonMode.CANCEL);
-
-    /**
-     * Attempts to install a pane in the on-screen data import dialog box that contains
-     * static text.
-     *
-     * The text appears centered in the data import dialog box and is drawn in
-     * the system font. This is a convenience method only; similar results could be
-     * achieved by manually constructing a Gtk.Label widget, wrapping it inside a
-     * {@link DialogPane}, and installing it manually with a call to
-     * install_dialog_pane( ). To provide visual consistency across data import services,
-     * however, always use this convenience method instead of constructing label panes when
-     * you need to display static text to the user.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param message the text to show in the pane
-     *
-     * @param mode allows you to set the text displayed on the close/cancel button in the
-     * lower-right-hand corner of the on-screen data import dialog box when pane is installed.
-     * If mode is ButtonMode.CLOSE, the button will have the title "Close." If mode is
-     * ButtonMode.CANCEL, the button will be titled "Cancel." You should set mode depending on
-     * whether a cancellable action is in progress. For example, if your importer is in the
-     * middle of processing 3 of 8 videos, then mode should be ButtonMode.CANCEL. However, if
-     * the processing operation has completed and the success pane is displayed, then mode
-     * should be ButtonMode.CLOSE, because all cancellable actions have already
-     * occurred.
-     */
-    public abstract void install_static_message_pane (string message,
-            ButtonMode mode = ButtonMode.CANCEL);
-
-    /**
-     * Attempts to install a library selection pane that presents a list of
-     * discovered libraries to the user.
-     *
-     * When the user clicks the “OK” button, you’ll be notified of the user’s action through
-     * the 'on_library_selected' callback if a discovered library was selected or through
-     * the 'on_file_selected' callback if a file was selected.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param welcome_message the text to be displayed above the list of discovered
-     * libraries.
-     *
-     * @param discovered_libraries the list of importable libraries that the plugin
-     * has discovered in well known locations.
-     *
-     * @param file_select_label the label to display for the file selection
-     * option. If this label is null, the
-     * user will not be presented with a file selection option.
-     */
-    public abstract void install_library_selection_pane (
-        string welcome_message,
-        ImportableLibrary[] discovered_libraries,
-        string? file_select_label
-    );
-
-    /**
-     * Attempts to install a progress pane that provides the user with feedback
-     * on import preparation.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param message the text to be displayed above the progress bar.
-     */
-    public abstract void install_import_progress_pane (
-        string message
-    );
-
-    /**
-     * Update the progress bar installed by install_import_progress_pane.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param progress a value between 0.0 and 1.0 identifying progress for the
-     * plugin.
-     *
-     * @param progress_label the text to be displayed below the progress bar. If that
-     * parameter is null, the message will be left unchanged.
-     */
-    public abstract void update_import_progress_pane (
-        double progress,
-        string? progress_message = null
-    );
-
-    /**
-     * Sends an importable media item to the host in order to prepare it for import
-     * and update the progress bar installed by install_import_progress_pane.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param item the importable media item to prepare for import.
-     *
-     * @param progress a value between 0.0 and 1.0 identifying progress for the
-     * plugin.
-     *
-     * @param host_progress_delta the amount of progress the host should update
-     * the progress bar during import preparation. Plugins should ensure that
-     * a proportion of progress for each media item is set aside for the host
-     * in oder to ensure a smoother update to the progress bar.
-     *
-     * @param progress_message the text to be displayed below the progress bar. If that
-     * parameter is null, the message will be left unchanged.
-     */
-    public abstract void prepare_media_items_for_import (
-        ImportableMediaItem[] items,
-        double progress,
-        double host_progress_delta = 0.0,
-        string? progress_message = null
-    );
-
-    /**
-     * Finalize the import sequence for the plugin. This tells the host that
-     * all media items have been processed and that the plugin has finished all
-     * import work. Once this method has been called, all resources used by the
-     * plugin for import should be released and the plugin should be back to the
-     * state it had just after running the start method. The host will then display
-     * the final message and show progress as fully complete. In a standard import
-     * scenario, the user is expected to click the Close button to dismiss the
-     * dialog. On first run, the host may call the LibrarySelectedCallback again
-     * to import another library handled by the same plugin.
-     *
-     * If an error has posted, the {@link PluginHost} will not honor this request.
-     *
-     * @param finalize_message the text to be displayed below the progress bar. If that
-     * parameter is null, the message will be left unchanged.
-     */
-    public abstract void finalize_import (
-        ImportedItemsCountCallback report_imported_items_count,
-        string? finalize_message = null
-    );
-
-    //
-    // For future expansion.
-    //
-    protected virtual void reserved0 () {}
-    protected virtual void reserved1 () {}
-    protected virtual void reserved2 () {}
-    protected virtual void reserved3 () {}
-    protected virtual void reserved4 () {}
-    protected virtual void reserved5 () {}
-    protected virtual void reserved6 () {}
-    protected virtual void reserved7 () {}
-}
-
-/**
- * Describes the features and capabilities of a data import service.
- *
- * Developers of data import plugins provide a class that implements this interface.
- */
-public interface Service : Object, Spit.Pluggable {
-    /**
-     * A factory method that instantiates and returns a new {@link DataImporter} object
-     * that this Service describes.
-     */
-    public abstract Spit.DataImports.DataImporter create_data_importer (Spit.DataImports.PluginHost host);
-
-    //
-    // For future expansion.
-    //
-    protected virtual void reserved0 () {}
-    protected virtual void reserved1 () {}
-    protected virtual void reserved2 () {}
-    protected virtual void reserved3 () {}
-    protected virtual void reserved4 () {}
-    protected virtual void reserved5 () {}
-    protected virtual void reserved6 () {}
-    protected virtual void reserved7 () {}
-}
-
-}
-

=== modified file 'src/plugins/mk/interfaces.mk'
--- src/plugins/mk/interfaces.mk	2013-04-25 00:53:04 +0000
+++ src/plugins/mk/interfaces.mk	2014-08-28 06:03:26 +0000
@@ -2,8 +2,7 @@
 PLUGIN_INTERFACES := \
 	src/plugins/SpitInterfaces.vala \
 	src/plugins/TransitionsInterfaces.vala \
-	src/plugins/PublishingInterfaces.vala \
-	src/plugins/DataImportsInterfaces.vala
+	src/plugins/PublishingInterfaces.vala
 
 PLUGIN_PKG_REQS := \
 	gobject-2.0 \

=== modified file 'src/plugins/mk/plugins.mk'
--- src/plugins/mk/plugins.mk	2012-02-02 22:56:06 +0000
+++ src/plugins/mk/plugins.mk	2014-08-28 06:03:26 +0000
@@ -15,8 +15,7 @@
 	SpitInterfaces.vala \
 	TransitionsInterfaces.vala \
 	StandardHostInterface.vala \
-	ManifestWidget.vala \
-	DataImportsInterfaces.vala
+	ManifestWidget.vala
 
 # Any unit this unit relies upon (and should be initialized before it's initialized) should
 # be listed here using its Vala namespace.

=== modified file 'src/tags/HierarchicalTagUtilities.vala'
--- src/tags/HierarchicalTagUtilities.vala	2014-08-08 21:13:09 +0000
+++ src/tags/HierarchicalTagUtilities.vala	2014-08-28 06:03:26 +0000
@@ -78,18 +78,6 @@
         return components;
     }
 
-    /**
-     * given a list of path elements, create a fully qualified path string.
-     * For example if 'path_elements' is the list { "Animals",  "Mammals", "Elephant" }
-     * the path "/Animals/Mammals/Elephant" will be returned
-     */
-    public static string? join_path_components (string[] path_components) {
-        if (path_components.length <= 0)
-            return null;
-        string tmp = string.joinv (Tag.PATH_SEPARATOR_STRING, path_components);
-        return string.joinv (Tag.PATH_SEPARATOR_STRING, { "", tmp });
-    }
-
     public static string get_basename (string in_path) {
         string path = flat_to_hierarchical (in_path);
 

=== modified file 'units.mk'
--- units.mk	2014-08-28 03:37:44 +0000
+++ units.mk	2014-08-28 06:03:26 +0000
@@ -24,8 +24,7 @@
 	tags \
 	camera \
 	searches \
-	config \
-	data_imports
+	config
 
 # Name(s) of units that represent application entry points.  These units will have init and
 # termination entry points generated: Name.unitize_init() and Name.unitize_terminate().  These