summaryrefslogtreecommitdiff
path: root/src/slideshow/TransitionEffects.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 /src/slideshow/TransitionEffects.vala
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/slideshow/TransitionEffects.vala')
-rw-r--r--src/slideshow/TransitionEffects.vala12
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) {