diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
commit | f39ea21098340bd99c48669f152c9068046c2c99 (patch) | |
tree | d1166fce1a4a8c470dfaf364816f767678c4729e /src/events/EventPage.vala | |
parent | bc48a4cff815ed156b603c92e684779c317417ba (diff) | |
parent | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff) |
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/events/EventPage.vala')
-rw-r--r-- | src/events/EventPage.vala | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala index 8b271d1..960eee8 100644 --- a/src/events/EventPage.vala +++ b/src/events/EventPage.vala @@ -13,7 +13,7 @@ public class EventPage : CollectionPage { this.page_event = page_event; page_event.mirror_photos(get_view(), create_thumbnail); - init_page_context_menu("/EventContextMenu"); + init_page_context_menu("EventContextMenu"); Event.global.items_altered.connect(on_events_altered); } @@ -53,10 +53,17 @@ public class EventPage : CollectionPage { { "EditEventComment", on_edit_comment } }; - 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 void init_actions(int selected_count, int count) { |