summaryrefslogtreecommitdiff
path: root/src/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'src/slideshow')
-rw-r--r--src/slideshow/Slideshow.vala20
-rw-r--r--src/slideshow/TransitionEffects.vala12
2 files changed, 17 insertions, 15 deletions
diff --git a/src/slideshow/Slideshow.vala b/src/slideshow/Slideshow.vala
index 5d14b64..0ee9392 100644
--- a/src/slideshow/Slideshow.vala
+++ b/src/slideshow/Slideshow.vala
@@ -8,16 +8,16 @@ namespace Slideshow {
public void init() throws Error {
string[] core_ids = new string[0];
- core_ids += "org.yorba.shotwell.transitions.crumble";
- core_ids += "org.yorba.shotwell.transitions.fade";
- core_ids += "org.yorba.shotwell.transitions.slide";
- core_ids += "org.yorba.shotwell.transitions.blinds";
- core_ids += "org.yorba.shotwell.transitions.circle";
- core_ids += "org.yorba.shotwell.transitions.circles";
- core_ids += "org.yorba.shotwell.transitions.clock";
- core_ids += "org.yorba.shotwell.transitions.stripes";
- core_ids += "org.yorba.shotwell.transitions.squares";
- core_ids += "org.yorba.shotwell.transitions.chess";
+ core_ids += "org.gnome.shotwell.transitions.crumble";
+ core_ids += "org.gnome.shotwell.transitions.fade";
+ core_ids += "org.gnome.shotwell.transitions.slide";
+ core_ids += "org.gnome.shotwell.transitions.blinds";
+ core_ids += "org.gnome.shotwell.transitions.circle";
+ core_ids += "org.gnome.shotwell.transitions.circles";
+ core_ids += "org.gnome.shotwell.transitions.clock";
+ core_ids += "org.gnome.shotwell.transitions.stripes";
+ core_ids += "org.gnome.shotwell.transitions.squares";
+ core_ids += "org.gnome.shotwell.transitions.chess";
Plugins.register_extension_point(typeof(Spit.Transitions.Descriptor), _("Slideshow Transitions"),
Resources.ICON_SLIDESHOW_EXTENSION_POINT, core_ids);
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) {