anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Delegate activate_action to UI thread

Browse source
This commit is contained in:
LAGonauta 2021-02-27 15:53:56 -03:00
parent 839d2a5316
commit f2c689fa12
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
plugins/windows-notification/src/win_notification_provider.vala
View file

@ -7,6 +7,8 @@ using Gee;
namespace Dino.Plugins.WindowsNotification { namespace Dino.Plugins.WindowsNotification {
public class WindowsNotificationProvider : NotificationProvider, Object { public class WindowsNotificationProvider : NotificationProvider, Object {
private delegate void DelegateToUi();
private static uint notification_counter = 0; private static uint notification_counter = 0;
private ToastNotifier notifier; private ToastNotifier notifier;
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
@ -63,16 +65,18 @@ namespace Dino.Plugins.WindowsNotification {
var notification_id = generate_id(); var notification_id = generate_id();
notification.Activated((argument, user_input) => { notification.Activated((argument, user_input) => {
if (argument != null) { run_on_ui(() => {
app.activate_action(argument, conversation.id); if (argument != null) {
} else { app.activate_action(argument, conversation.id);
app.activate_action("open-conversation", conversation.id); } else {
} app.activate_action("open-conversation", conversation.id);
}
});
marked_for_removal.add(notification_id); marked_for_removal.add(notification_id);
}); });
notification.Dismissed((reason) => marked_for_removal.add(notification_id)); notification.Dismissed((reason) => marked_for_removal.add(notification_id));
notification.Failed(() => marked_for_removal.add(notification_id)); notification.Failed(() => marked_for_removal.add(notification_id));
@ -137,16 +141,18 @@ namespace Dino.Plugins.WindowsNotification {
var notification_id = generate_id(); var notification_id = generate_id();
var group_conversation_id = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(room_jid, account, Conversation.Type.GROUPCHAT).id; var group_conversation_id = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(room_jid, account, Conversation.Type.GROUPCHAT).id;
notification.Activated((argument, user_input) => { notification.Activated((argument, user_input) => {
if (argument != null) { run_on_ui(() => {
app.activate_action(argument, group_conversation_id); if (argument != null) {
} else { app.activate_action(argument, group_conversation_id);
app.activate_action("open-muc-join", group_conversation_id); } else {
} app.activate_action("open-muc-join", group_conversation_id);
}
});
marked_for_removal.add(notification_id); marked_for_removal.add(notification_id);
}); });
notification.Dismissed((reason) => marked_for_removal.add(notification_id)); notification.Dismissed((reason) => marked_for_removal.add(notification_id));
notification.Failed(() => marked_for_removal.add(notification_id)); notification.Failed(() => marked_for_removal.add(notification_id));
@ -172,13 +178,13 @@ namespace Dino.Plugins.WindowsNotification {
var notification_id = generate_id(); var notification_id = generate_id();
notification.Activated((argument, user_input) => { notification.Activated((argument, user_input) => {
if (argument != null) { if (argument != null) {
app.activate_action(argument, conversation.id); run_on_ui(() => app.activate_action(argument, conversation.id));
} }
marked_for_removal.add(notification_id); marked_for_removal.add(notification_id);
}); });
notification.Dismissed((reason) => marked_for_removal.add(notification_id)); notification.Dismissed((reason) => marked_for_removal.add(notification_id));
notification.Failed(() => marked_for_removal.add(notification_id)); notification.Failed(() => marked_for_removal.add(notification_id));
@ -203,7 +209,7 @@ namespace Dino.Plugins.WindowsNotification {
var notification_id = generate_id(); var notification_id = generate_id();
notification.Activated((argument, user_input) => { notification.Activated((argument, user_input) => {
app.activate_action("open-conversation", conversation.id); run_on_ui(() => app.activate_action("open-conversation", conversation.id));
marked_for_removal.add(notification_id); marked_for_removal.add(notification_id);
}); });
@ -255,5 +261,9 @@ namespace Dino.Plugins.WindowsNotification {
private uint generate_id() { private uint generate_id() {
return AtomicUint.add(ref notification_counter, 1); return AtomicUint.add(ref notification_counter, 1);
} }
private void run_on_ui(DelegateToUi func) {
Idle.add(() => { func(); return false; }, GLib.Priority.HIGH);
}
} }
} }