[geary/mjog/notfication-avatars: 2/6] Application.AvatarStore: Move pixel size constant to Client

[Michael Gratton <mjog src gnome org>]

commit 335c31b8efaf8e5159f5ea9d67c90f67f41e43d1
Author: Michael Gratton <mike vee net>
Date:   Thu Mar 12 10:17:27 2020 +1100

    Application.AvatarStore: Move pixel size constant to Client

 src/client/application/application-avatar-store.vala          |  3 ---
 src/client/application/application-client.vala                |  3 +++
 .../conversation-viewer/conversation-contact-popover.vala     |  8 ++++----
 src/client/conversation-viewer/conversation-message.vala      | 11 ++++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/src/client/application/application-avatar-store.vala 
b/src/client/application/application-avatar-store.vala
index 03dfdd09..a0b061bd 100644
--- a/src/client/application/application-avatar-store.vala
+++ b/src/client/application/application-avatar-store.vala
@@ -24,9 +24,6 @@
 public class Application.AvatarStore : Geary.BaseObject {
 
 
-    /** Default size of avatar images, in virtual pixels */
-    public const int PIXEL_SIZE = 48;
-
     // Max size is low since most conversations don't get above the
     // low hundreds of messages, and those that do will likely get
     // many repeated participants
diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
index 299ec777..6ff43b89 100644
--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
@@ -53,6 +53,9 @@ public class Application.Client : Gtk.Application {
         null
     };
 
+    /** Default size of avatar images, in virtual pixels */
+    public const int AVATAR_SIZE_PIXELS = 48;
+
     // Local-only command line options
     private const string OPTION_VERSION = "version";
 
diff --git a/src/client/conversation-viewer/conversation-contact-popover.vala 
b/src/client/conversation-viewer/conversation-contact-popover.vala
index 39dc97a3..9d58193c 100644
--- a/src/client/conversation-viewer/conversation-contact-popover.vala
+++ b/src/client/conversation-viewer/conversation-contact-popover.vala
@@ -107,12 +107,12 @@ public class Conversation.ContactPopover : Gtk.Popover {
     public async void load_avatar() {
         var main = this.get_toplevel() as Application.MainWindow;
         if (main != null) {
-            Application.AvatarStore loader = main.application.controller.avatars;
             int window_scale = get_scale_factor();
-            int pixel_size = Application.AvatarStore.PIXEL_SIZE * window_scale;
+            int pixel_size = (
+                Application.Client.AVATAR_SIZE_PIXELS * window_scale
+            );
             try {
-                Gdk.Pixbuf? avatar_buf = yield loader.load(
-                    this.contact,
+                Gdk.Pixbuf? avatar_buf = yield contact.load_avatar(
                     this.mailbox,
                     pixel_size,
                     this.load_cancellable
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index 22782c4c..8b27a10a 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -728,11 +728,10 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
                     this.primary_originator, cancellable
                 );
 
-                Application.AvatarStore loader = main.application.controller.avatars;
                 int window_scale = get_scale_factor();
-                int pixel_size = Application.AvatarStore.PIXEL_SIZE * window_scale;
-                Gdk.Pixbuf? avatar_buf = yield loader.load(
-                    this.primary_contact,
+                int pixel_size =
+                    Application.Client.AVATAR_SIZE_PIXELS * window_scale;
+                Gdk.Pixbuf? avatar_buf = yield this.primary_contact.load_avatar(
                     this.primary_originator,
                     pixel_size,
                     cancellable
@@ -748,7 +747,9 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
                 this.avatar.set_from_icon_name(
                     "avatar-default-symbolic", Gtk.IconSize.DIALOG
                 );
-                this.avatar.set_pixel_size(Application.AvatarStore.PIXEL_SIZE);
+                this.avatar.set_pixel_size(
+                    Application.Client.AVATAR_SIZE_PIXELS
+                );
             }