diff options
author | fiaxh <git@lightrise.org> | 2020-11-11 11:27:31 +0100 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2020-11-11 11:27:31 +0100 |
commit | 10adf716f3b94073f099dfb18ecdaf41dafcab2d (patch) | |
tree | c732f058d30a86092be3d92d1e3fbf40c9d7c1ac /libdino | |
parent | b2c7e9dfff2e00549fc23ad8e531d77daa6c2738 (diff) | |
download | dino-10adf716f3b94073f099dfb18ecdaf41dafcab2d.tar.gz dino-10adf716f3b94073f099dfb18ecdaf41dafcab2d.zip |
Fix incoming muc voice request notification
Diffstat (limited to 'libdino')
-rw-r--r-- | libdino/src/service/muc_manager.vala | 6 | ||||
-rw-r--r-- | libdino/src/service/notification_events.vala | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 8eba524d..178cc8f9 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -14,7 +14,7 @@ public class MucManager : StreamInteractionModule, Object { public signal void room_info_updated(Account account, Jid muc_jid); public signal void private_room_occupant_updated(Account account, Jid room, Jid occupant); public signal void invite_received(Account account, Jid room_jid, Jid from_jid, string? password, string? reason); - public signal void voice_request_received(Account account, Jid room_jid, Jid from_jid, string? nick, string? role, string? label); + public signal void voice_request_received(Account account, Jid room_jid, Jid from_jid, string nick); public signal void received_occupant_role(Account account, Jid jid, Xep.Muc.Role? role); public signal void bookmarks_updated(Account account, Set<Conference> conferences); public signal void conference_added(Account account, Conference conference); @@ -364,8 +364,8 @@ public class MucManager : StreamInteractionModule, Object { stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).invite_received.connect( (stream, room_jid, from_jid, password, reason) => { invite_received(account, room_jid, from_jid, password, reason); }); - stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).voice_request_received.connect( (stream, room_jid, from_jid, nick, role, label) => { - voice_request_received(account, room_jid, from_jid, nick, role, label); + stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).voice_request_received.connect( (stream, room_jid, from_jid, nick) => { + voice_request_received(account, room_jid, from_jid, nick); }); stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).received_occupant_role.connect( (stream, from_jid, role) => { received_occupant_role(account, from_jid, role); diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala index 19d61d0f..f6ef7019 100644 --- a/libdino/src/service/notification_events.vala +++ b/libdino/src/service/notification_events.vala @@ -13,7 +13,7 @@ public class NotificationEvents : StreamInteractionModule, Object { public signal void notify_subscription_request(Conversation conversation); public signal void notify_connection_error(Account account, ConnectionManager.ConnectionError error); public signal void notify_muc_invite(Account account, Jid room_jid, Jid from_jid, string? password, string? reason); - public signal void notify_voice_request(Account account, Jid room_jid, Jid from_jid, string? nick, string? role, string? label); + public signal void notify_voice_request(Account account, Jid room_jid, Jid from_jid, string nick); private StreamInteractor stream_interactor; @@ -28,7 +28,7 @@ public class NotificationEvents : StreamInteractionModule, Object { stream_interactor.get_module(ContentItemStore.IDENTITY).new_item.connect(on_content_item_received); stream_interactor.get_module(PresenceManager.IDENTITY).received_subscription_request.connect(on_received_subscription_request); stream_interactor.get_module(MucManager.IDENTITY).invite_received.connect((account, room_jid, from_jid, password, reason) => notify_muc_invite(account, room_jid, from_jid, password, reason)); - stream_interactor.get_module(MucManager.IDENTITY).voice_request_received.connect((account, room_jid, from_jid, nick, role, label) => notify_voice_request(account, room_jid, from_jid, nick, role, label)); + stream_interactor.get_module(MucManager.IDENTITY).voice_request_received.connect((account, room_jid, from_jid, nick) => notify_voice_request(account, room_jid, from_jid, nick)); stream_interactor.connection_manager.connection_error.connect((account, error) => notify_connection_error(account, error)); } |