aboutsummaryrefslogtreecommitdiff
path: root/libdino/src
diff options
context:
space:
mode:
Diffstat (limited to 'libdino/src')
-rw-r--r--libdino/src/service/connection_manager.vala2
-rw-r--r--libdino/src/service/notification_events.vala3
-rw-r--r--libdino/src/util/display_name.vala6
3 files changed, 5 insertions, 6 deletions
diff --git a/libdino/src/service/connection_manager.vala b/libdino/src/service/connection_manager.vala
index 454bcc2c..1439c6f3 100644
--- a/libdino/src/service/connection_manager.vala
+++ b/libdino/src/service/connection_manager.vala
@@ -170,7 +170,7 @@ public class ConnectionManager : Object {
public async void disconnect_account(Account account) {
if (connections.has_key(account)) {
make_offline(account);
- connections[account].disconnect_account();
+ connections[account].disconnect_account.begin();
connections.unset(account);
}
}
diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala
index 0243dbe5..7039d1cf 100644
--- a/libdino/src/service/notification_events.vala
+++ b/libdino/src/service/notification_events.vala
@@ -112,9 +112,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
notifier.notify_call.begin(call, conversation, video, conversation_display_name);
call.notify["state"].connect(() => {
-
if (call.state != Call.State.RINGING) {
- notifier.retract_call_notification(call, conversation);
+ notifier.retract_call_notification.begin(call, conversation);
}
});
}
diff --git a/libdino/src/util/display_name.vala b/libdino/src/util/display_name.vala
index 7fa741af..0c05eda8 100644
--- a/libdino/src/util/display_name.vala
+++ b/libdino/src/util/display_name.vala
@@ -36,7 +36,7 @@ namespace Dino {
return participant.bare_jid.to_string();
}
- private static string? get_real_display_name(StreamInteractor stream_interactor, Account account, Jid jid, string? self_word = null) {
+ public static string? get_real_display_name(StreamInteractor stream_interactor, Account account, Jid jid, string? self_word = null) {
if (jid.equals_bare(account.bare_jid)) {
if (self_word != null || account.alias == null || account.alias.length == 0) {
return self_word;
@@ -50,7 +50,7 @@ namespace Dino {
return null;
}
- private static string get_groupchat_display_name(StreamInteractor stream_interactor, Account account, Jid jid) {
+ public static string get_groupchat_display_name(StreamInteractor stream_interactor, Account account, Jid jid) {
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
string? room_name = muc_manager.get_room_name(account, jid);
if (room_name != null && room_name != jid.localpart) {
@@ -72,7 +72,7 @@ namespace Dino {
return jid.to_string();
}
- private static string get_occupant_display_name(StreamInteractor stream_interactor, Conversation conversation, Jid jid, string? self_word = null, bool muc_real_name = false) {
+ public static string get_occupant_display_name(StreamInteractor stream_interactor, Conversation conversation, Jid jid, string? self_word = null, bool muc_real_name = false) {
if (muc_real_name) {
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
if (muc_manager.is_private_room(conversation.account, jid.bare_jid)) {