aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/ui/conversation_content_view/call_widget.vala4
-rw-r--r--main/src/ui/conversation_titlebar/call_entry.vala3
-rw-r--r--main/src/ui/notifier_freedesktop.vala5
-rw-r--r--main/src/ui/notifier_gnotifications.vala7
4 files changed, 13 insertions, 6 deletions
diff --git a/main/src/ui/conversation_content_view/call_widget.vala b/main/src/ui/conversation_content_view/call_widget.vala
index d9060872..e45792e2 100644
--- a/main/src/ui/conversation_content_view/call_widget.vala
+++ b/main/src/ui/conversation_content_view/call_widget.vala
@@ -124,7 +124,11 @@ namespace Dino.Ui {
image.set_from_icon_name("dino-phone-ring-symbolic", IconSize.LARGE_TOOLBAR);
if (call.direction == Call.DIRECTION_INCOMING) {
bool video = call_manager.should_we_send_video();
+
title_label.label = video ? _("Incoming video call") : _("Incoming call");
+ if (call_manager.invited_to_group_call != null) {
+ title_label.label = video ? _("Incoming video group call") : _("Incoming group call");
+ }
if (stream_interactor.get_module(Calls.IDENTITY).can_we_do_calls(call.account)) {
subtitle_label.label = "Ring ring…!";
diff --git a/main/src/ui/conversation_titlebar/call_entry.vala b/main/src/ui/conversation_titlebar/call_entry.vala
index e5b7281c..1b8b2a05 100644
--- a/main/src/ui/conversation_titlebar/call_entry.vala
+++ b/main/src/ui/conversation_titlebar/call_entry.vala
@@ -84,9 +84,6 @@ namespace Dino.Ui {
stream_interactor.connection_manager.connection_state_changed.connect((account, state) => {
update_visibility.begin();
});
- Dino.Application.get_default().plugin_registry.video_call_plugin.devices_changed.connect((media, incoming) => {
- update_visibility.begin();
- });
}
private void open_call_window(CallState call_state) {
diff --git a/main/src/ui/notifier_freedesktop.vala b/main/src/ui/notifier_freedesktop.vala
index 17de0ce9..b6b31d34 100644
--- a/main/src/ui/notifier_freedesktop.vala
+++ b/main/src/ui/notifier_freedesktop.vala
@@ -107,10 +107,13 @@ public class Dino.Ui.FreeDesktopNotifier : NotificationProvider, Object {
}
}
- public async void notify_call(Call call, Conversation conversation, bool video, string conversation_display_name) {
+ public async void notify_call(Call call, Conversation conversation, bool video, bool multiparty, string conversation_display_name) {
debug("[%s] Call notification", call.account.bare_jid.to_string());
string summary = Markup.escape_text(conversation_display_name);
string body = video ? _("Incoming video call") : _("Incoming call");
+ if (multiparty) {
+ body = video ? _("Incoming video group call") : _("Incoming group call");
+ }
HashTable<string, Variant> hash_table = new HashTable<string, Variant>(null, null);
hash_table["image-path"] = "call-start-symbolic";
diff --git a/main/src/ui/notifier_gnotifications.vala b/main/src/ui/notifier_gnotifications.vala
index 665d47c4..d569a358 100644
--- a/main/src/ui/notifier_gnotifications.vala
+++ b/main/src/ui/notifier_gnotifications.vala
@@ -65,9 +65,12 @@ namespace Dino.Ui {
}
}
- public async void notify_call(Call call, Conversation conversation, bool video, string conversation_display_name) {
+ public async void notify_call(Call call, Conversation conversation, bool video, bool multiparty, string conversation_display_name) {
Notification notification = new Notification(conversation_display_name);
- string body = _("Incoming call");
+ string body = video ? _("Incoming video call") : _("Incoming call");
+ if (multiparty) {
+ body = video ? _("Incoming video group call") : _("Incoming group call");
+ }
notification.set_body(body);
notification.set_urgent(true);