Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 11 insertions, 4 deletions

diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index c43c0c8..df39f64 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -170,10 +170,17 @@ public abstract class CollectionPage : MediaPage {
         { "Slideshow", on_slideshow }
     };
 
-    protected override void add_actions () {
-        base.add_actions ();
+    protected override void add_actions (GLib.ActionMap map) {
+        base.add_actions (map);
 
-        AppWindow.get_instance ().add_action_entries (entries, this);
+        map.add_action_entries (entries, this);
+    }
+
+    protected override void remove_actions(GLib.ActionMap map) {
+        base.remove_actions(map);
+        foreach (var entry in entries) {
+            map.remove_action(entry.name);
+        }
     }
 
     protected override InjectionGroup[] init_collect_injection_groups() {
@@ -312,7 +319,7 @@ public abstract class CollectionPage : MediaPage {
     }
     
     // see #2020
-    // double clcik = switch to photo page
+    // double click = switch to photo page
     // Super + double click = open in external editor
     // Enter = switch to PhotoPage
     // Ctrl + Enter = open in external editor (handled with accelerators)