Merge branch 'feature/upstream' into develop

1 files changed, 7 insertions, 5 deletions

diff --git a/src/slideshow/TransitionEffects.vala b/src/slideshow/TransitionEffects.vala
index 5f7dc88..23c666a 100644
--- a/src/slideshow/TransitionEffects.vala
+++ b/src/slideshow/TransitionEffects.vala
@@ -71,7 +71,7 @@ public class TransitionEffectsManager {
         return effects.keys;
     }
     
-    public Gee.Collection<string> get_effect_names(owned CompareDataFunc? comparator = null) {
+    public Gee.Collection<string> get_effect_names(owned CompareDataFunc<string>? comparator = null) {
         Gee.Collection<string> effect_names = new Gee.TreeSet<string>((owned) comparator);
         foreach (Spit.Transitions.Descriptor desc in effects.values)
             effect_names.add(desc.get_pluggable_name());
@@ -273,7 +273,7 @@ public class TransitionClock {
 }
 
 public class NullTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.null";
+    public const string EFFECT_ID = "org.gnome.shotwell.transitions.null";
     
     public int get_pluggable_interface(int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;
@@ -287,7 +287,8 @@ public class NullTransitionDescriptor : Object, Spit.Pluggable, Spit.Transitions
         return _("None");
     }
     
-    public void get_info(ref Spit.PluggableInfo info) {
+    public Spit.PluggableInfo get_info() {
+        return new Spit.PluggableInfo();
     }
     
     public void activation(bool enabled) {
@@ -325,7 +326,7 @@ public class NullEffect : Object, Spit.Transitions.Effect {
     }
 }
 public class RandomEffectDescriptor : Object, Spit.Pluggable, Spit.Transitions.Descriptor {
-    public const string EFFECT_ID = "org.yorba.shotwell.transitions.random";
+    public const string EFFECT_ID = "org.gnome.shotwell.transitions.random";
 
     public int get_pluggable_interface(int min_host_version, int max_host_version) {
         return Spit.Transitions.CURRENT_INTERFACE;
@@ -339,7 +340,8 @@ public class RandomEffectDescriptor : Object, Spit.Pluggable, Spit.Transitions.D
         return _("Random");
     }
 
-    public void get_info(ref Spit.PluggableInfo info) {
+    public Spit.PluggableInfo get_info() {
+        return new Spit.PluggableInfo();
     }
     
     public void activation(bool enabled) {