nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Plugin.DesktopNotifications: Display avatar in notifications if poss

Browse source
This commit is contained in:
Michael Gratton 2020-03-12 10:19:15 +11:00 • committed by Michael James Gratton
parent c4d046ea61
commit b0e77dc717
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/client/plugin/desktop-notifications/desktop-notifications.vala
View file

@ -85,6 +85,7 @@ public class Plugin.DesktopNotifications :
Email email
) throws GLib.Error {
string title = to_notitication_title(folder.account, total);
Gdk.Pixbuf? icon = null;
Geary.RFC822.MailboxAddress? originator = email.get_primary_originator();
if (originator != null) {
ContactStore contacts =
@ -92,11 +93,26 @@ public class Plugin.DesktopNotifications :
global::Application.Contact? contact = yield contacts.load(
originator, this.cancellable
);
title = (
contact.is_trusted
? contact.display_name
: originator.to_short_display()
);
int window_scale = 1;
Gdk.Display? display = Gdk.Display.get_default();
if (display != null) {
Gdk.Monitor? monitor = display.get_primary_monitor();
if (monitor != null) {
window_scale = monitor.scale_factor;
}
}
icon = yield contact.load_avatar(
originator,
global::Application.Client.AVATAR_SIZE_PIXELS * window_scale,
this.cancellable
);
}
string body = email.subject;
@ -116,7 +132,7 @@ public class Plugin.DesktopNotifications :
);
}
issue_arrived_notification(title, body, folder, email.identifier);
issue_arrived_notification(title, body, icon, folder, email.identifier);
}
private void notify_general(Folder folder, int total, int added) {
@ -142,11 +158,12 @@ public class Plugin.DesktopNotifications :
).printf(body, total);
}
issue_arrived_notification(title, body, folder, null);
issue_arrived_notification(title, body, null, folder, null);
}
private void issue_arrived_notification(string summary,
string body,
Gdk.Pixbuf? icon,
Folder folder,
EmailIdentifier? id) {
// only one outstanding notification at a time
@ -168,6 +185,7 @@ public class Plugin.DesktopNotifications :
ARRIVED_ID,
summary,
body,
icon,
Action.Application.prefix(action),
new GLib.Variant.tuple(target_param)
);
@ -176,15 +194,18 @@ public class Plugin.DesktopNotifications :
private GLib.Notification issue_notification(string id,
string summary,
string body,
Gdk.Pixbuf? avatar,
string? action,
GLib.Variant? action_target) {
GLib.Icon icon = avatar;
if (avatar == null) {
icon = new GLib.ThemedIcon(
"%s-symbolic".printf(global::Application.Client.APP_ID)
);
}
GLib.Notification notification = new GLib.Notification(summary);
notification.set_body(body);
notification.set_icon(
new GLib.ThemedIcon(
"%s-symbolic".printf(global::Application.Client.APP_ID)
)
);
notification.set_icon(icon);
// Do not show notification actions under Unity, it's
// notifications daemon doesn't support them.