Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 51 deletions

diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
deleted file mode 100644
index fb622fa..0000000
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * 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;
-
-private class ShotwellPublishingExtraServices : Object, Spit.Module {
-    private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
-
-    public ShotwellPublishingExtraServices(GLib.File module_file) {
-#if HAVE_YANDEX
-        pluggables += new YandexService();
-#endif
-
-#if HAVE_RAJCE
-        pluggables += new RajceService(module_file.get_parent());
-#endif
-
-#if HAVE_GALLERY3
-        pluggables += new Gallery3Service(module_file.get_parent());
-#endif
-    }
-    
-    public unowned string get_module_name() {
-        return _("Shotwell Extra Publishing Services");
-    }
-    
-    public unowned string get_version() {
-        return _VERSION;
-    }
-    
-    public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.extras";
-    }
-    
-    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 ShotwellPublishingExtraServices(params->module_file) : null;
-}
-