aboutsummaryrefslogtreecommitdiff
path: root/libdino/src
diff options
context:
space:
mode:
authorcodedust <codedust@users.noreply.github.com>2018-08-20 02:59:58 +0200
committerfiaxh <git@mx.ax.lt>2018-11-02 15:14:35 +0100
commit1e54a442ba78cd117c0262b9b5e83ef4438e5858 (patch)
tree025be91fe62a1284ac911a7919792afe2bce1ea2 /libdino/src
parent4ad07fea47e9e3463e864673b9c601b304b05270 (diff)
downloaddino-1e54a442ba78cd117c0262b9b5e83ef4438e5858.tar.gz
dino-1e54a442ba78cd117c0262b9b5e83ef4438e5858.zip
Display room name in conversation selector and conversation titlebar
Diffstat (limited to 'libdino/src')
-rw-r--r--libdino/src/service/muc_manager.vala6
1 files changed, 5 insertions, 1 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala
index a0f7fe70..98700c60 100644
--- a/libdino/src/service/muc_manager.vala
+++ b/libdino/src/service/muc_manager.vala
@@ -12,6 +12,7 @@ public class MucManager : StreamInteractionModule, Object {
public signal void enter_error(Account account, Jid jid, Xep.Muc.MucEnterError error);
public signal void left(Account account, Jid jid);
public signal void subject_set(Account account, Jid jid, string? subject);
+ public signal void room_name_set(Account account, Jid jid, string? room_name);
public signal void bookmarks_updated(Account account, Gee.List<Xep.Bookmarks.Conference> conferences);
private StreamInteractor stream_interactor;
@@ -42,7 +43,7 @@ public class MucManager : StreamInteractionModule, Object {
Entities.Message? last_message = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message(conversation);
if (last_message != null) history_since = last_message.time;
}
-
+
stream.get_module(Xep.Muc.Module.IDENTITY).enter(stream, jid.bare_jid, nick_, password, history_since);
}
@@ -242,6 +243,9 @@ public class MucManager : StreamInteractionModule, Object {
stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).subject_set.connect( (stream, subject, jid) => {
subject_set(account, jid, subject);
});
+ stream_interactor.module_manager.get_module(account, Xep.Muc.Module.IDENTITY).room_name_set.connect( (stream, jid, room_name) => {
+ room_name_set(account, jid, room_name);
+ });
stream_interactor.module_manager.get_module(account, Xep.Bookmarks.Module.IDENTITY).received_conferences.connect( (stream, conferences) => {
sync_autojoin_active(account, conferences);
bookmarks_updated(account, conferences);