summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing/shotwell-publishing.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
commitbb80d3feebdc9acc52e3f4ad24084d8425f043a2 (patch)
tree2084a84c39f159c6aea254775dc0880d52579d45 /plugins/shotwell-publishing/shotwell-publishing.vala
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins/shotwell-publishing/shotwell-publishing.vala')
-rw-r--r--plugins/shotwell-publishing/shotwell-publishing.vala20
1 files changed, 6 insertions, 14 deletions
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index 52c82ec..f5251f4 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -13,45 +13,37 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
// we need to get a module file handle because our pluggables have to load resources from the
// module file directory
public ShotwellPublishingCoreServices(GLib.File module_file) {
- GLib.File resource_directory = module_file.get_parent();
var factory = Publishing.Authenticator.Factory.get_instance();
var authenicators = factory.get_available_authenticators();
// Prevent vala complaining when all authenticators from this plugin
// are disabled
- debug("Looking for resources in %s", resource_directory.get_path());
debug("Found %d authenicators", authenicators.size);
-#if HAVE_FACEBOOK
- if (authenicators.contains("facebook")) {
- pluggables += new FacebookService(resource_directory);
- }
-#endif
-
#if HAVE_GOOGLEPHOTOS
if (authenicators.contains("google-photos")) {
- pluggables += new Publishing.GooglePhotos.Service(resource_directory);
+ pluggables += new Publishing.GooglePhotos.Service();
}
#endif
#if HAVE_FLICKR
if (authenicators.contains("flickr")) {
- pluggables += new FlickrService(resource_directory);
+ pluggables += new FlickrService();
}
#endif
#if HAVE_YOUTUBE
if (authenicators.contains("youtube")) {
- pluggables += new YouTubeService(resource_directory);
+ pluggables += new YouTubeService();
}
#endif
#if HAVE_PIWIGO
- pluggables += new PiwigoService(resource_directory);
+ pluggables += new PiwigoService();
#endif
#if HAVE_TUMBLR
- pluggables += new TumblrService(module_file.get_parent());
+ pluggables += new TumblrService();
#endif
}
@@ -64,7 +56,7 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
}
public unowned string get_id() {
- return "org.yorba.shotwell.publishing.core_services";
+ return "org.gnome.shotwell.publishing.core_services";
}
public unowned Spit.Pluggable[]? get_pluggables() {