[geary/mjog/email-templates: 38/72] Application: Rename plugin context objects to make their use clear

[Michael Gratton <mjog src gnome org>]

commit 8b3e01f11d326939281c8ba60e28146790601410
Author: Michael Gratton <mike vee net>
Date:   Tue Mar 31 18:43:37 2020 +1100

    Application: Rename plugin context objects to make their use clear

 po/POTFILES.in                                     |  6 +++---
 src/client/application/application-controller.vala |  6 +++---
 ....vala => application-email-plugin-context.vala} |  8 ++++----
 ...vala => application-folder-plugin-context.vala} | 10 +++++-----
 ...> application-notification-plugin-context.vala} |  8 ++++----
 .../application/application-plugin-manager.vala    | 22 +++++++++++-----------
 src/client/meson.build                             |  6 +++---
 7 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec902908..d2c77666 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,12 +23,12 @@ src/client/application/application-configuration.vala
 src/client/application/application-contact-store.vala
 src/client/application/application-contact.vala
 src/client/application/application-controller.vala
-src/client/application/application-email-context.vala
+src/client/application/application-email-plugin-context.vala
 src/client/application/application-email-store-factory.vala
-src/client/application/application-folder-context.vala
+src/client/application/application-folder-plugin-context.vala
 src/client/application/application-folder-store-factory.vala
 src/client/application/application-main-window.vala
-src/client/application/application-notification-context.vala
+src/client/application/application-notification-plugin-context.vala
 src/client/application/application-plugin-manager.vala
 src/client/application/application-startup-manager.vala
 src/client/application/goa-mediator.vala
diff --git a/src/client/application/application-controller.vala 
b/src/client/application/application-controller.vala
index da52ef18..4ca43b7f 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -1288,7 +1288,7 @@ internal class Application.Controller : Geary.BaseObject {
         foreach (MainWindow window in this.application.get_main_windows()) {
             window.folder_list.set_has_new(source, false);
         }
-        foreach (NotificationContext context in
+        foreach (NotificationPluginContext context in
                  this.plugins.get_notification_contexts()) {
             context.clear_new_messages(source, visible);
         }
@@ -1297,7 +1297,7 @@ internal class Application.Controller : Geary.BaseObject {
     /** Notifies plugins of new email being displayed. */
     internal void email_loaded(Geary.AccountInformation account,
                                Geary.Email loaded) {
-        foreach (EmailContext plugin in
+        foreach (EmailPluginContext plugin in
                  this.plugins.get_email_contexts()) {
             plugin.email_displayed(account, loaded);
         }
@@ -1477,7 +1477,7 @@ internal class Application.Controller : Geary.BaseObject {
 
         AccountContext? context = this.accounts.get(service.account);
         if (context != null) {
-            foreach (EmailContext plugin in
+            foreach (EmailPluginContext plugin in
                      this.plugins.get_email_contexts()) {
                 plugin.email_sent(context.account.information, sent);
             }
diff --git a/src/client/application/application-email-context.vala 
b/src/client/application/application-email-plugin-context.vala
similarity index 92%
rename from src/client/application/application-email-context.vala
rename to src/client/application/application-email-plugin-context.vala
index 32db1618..adeb2f4c 100644
--- a/src/client/application/application-email-context.vala
+++ b/src/client/application/application-email-plugin-context.vala
@@ -8,7 +8,7 @@
 /**
  * Implementation of the email plugin extension context.
  */
-internal class Application.EmailContext :
+internal class Application.EmailPluginContext :
     Geary.BaseObject, Plugin.EmailContext {
 
 
@@ -18,9 +18,9 @@ internal class Application.EmailContext :
     private string action_group_name;
 
 
-    internal EmailContext(Client application,
-                          EmailStoreFactory email_factory,
-                          string action_group_name) {
+    internal EmailPluginContext(Client application,
+                                EmailStoreFactory email_factory,
+                                string action_group_name) {
         this.application = application;
         this.email_factory = email_factory;
         this.email = email_factory.new_email_store();
diff --git a/src/client/application/application-folder-context.vala 
b/src/client/application/application-folder-plugin-context.vala
similarity index 88%
rename from src/client/application/application-folder-context.vala
rename to src/client/application/application-folder-plugin-context.vala
index 4444cf3d..1031e958 100644
--- a/src/client/application/application-folder-context.vala
+++ b/src/client/application/application-folder-plugin-context.vala
@@ -6,9 +6,9 @@
  */
 
 /**
- * Implementation of the folder extension context.
+ * Implementation of the folder plugin extension context.
  */
-internal class Application.FolderContext :
+internal class Application.FolderPluginContext :
     Geary.BaseObject, Plugin.FolderContext {
 
 
@@ -18,9 +18,9 @@ internal class Application.FolderContext :
     private string action_group_name;
 
 
-    internal FolderContext(Client application,
-                           FolderStoreFactory folders_factory,
-                           string action_group_name) {
+    internal FolderPluginContext(Client application,
+                                 FolderStoreFactory folders_factory,
+                                 string action_group_name) {
         this.application = application;
         this.folders_factory = folders_factory;
         this.folders = folders_factory.new_folder_store();
diff --git a/src/client/application/application-notification-context.vala 
b/src/client/application/application-notification-plugin-context.vala
similarity index 97%
rename from src/client/application/application-notification-context.vala
rename to src/client/application/application-notification-plugin-context.vala
index e45e9c04..915a7fb2 100644
--- a/src/client/application/application-notification-context.vala
+++ b/src/client/application/application-notification-plugin-context.vala
@@ -9,7 +9,7 @@
 /**
  * Implementation of the notification plugin extension context.
  */
-internal class Application.NotificationContext :
+internal class Application.NotificationPluginContext :
     Geary.BaseObject, Plugin.NotificationContext {
 
 
@@ -70,9 +70,9 @@ internal class Application.NotificationContext :
     private EmailStoreFactory email_factory;
 
 
-    internal NotificationContext(Client application,
-                                 FolderStoreFactory folders_factory,
-                                 EmailStoreFactory email_factory) {
+    internal NotificationPluginContext(Client application,
+                                       FolderStoreFactory folders_factory,
+                                       EmailStoreFactory email_factory) {
         this.application = application;
         this.folders_factory = folders_factory;
         this.email_factory = email_factory;
diff --git a/src/client/application/application-plugin-manager.vala 
b/src/client/application/application-plugin-manager.vala
index b60c5136..3bcae9c3 100644
--- a/src/client/application/application-plugin-manager.vala
+++ b/src/client/application/application-plugin-manager.vala
@@ -166,10 +166,10 @@ public class Application.PluginManager : GLib.Object {
 
     private Gee.Map<Peas.PluginInfo,PluginContext> plugin_set =
         new Gee.HashMap<Peas.PluginInfo,PluginContext>();
-    private Gee.Map<Peas.PluginInfo,NotificationContext> notification_contexts =
-        new Gee.HashMap<Peas.PluginInfo,NotificationContext>();
-    private Gee.Map<Peas.PluginInfo,EmailContext> email_contexts =
-        new Gee.HashMap<Peas.PluginInfo,EmailContext>();
+    private Gee.Map<Peas.PluginInfo,NotificationPluginContext> notification_contexts =
+        new Gee.HashMap<Peas.PluginInfo,NotificationPluginContext>();
+    private Gee.Map<Peas.PluginInfo,EmailPluginContext> email_contexts =
+        new Gee.HashMap<Peas.PluginInfo,EmailPluginContext>();
 
 
     public PluginManager(Client application) throws GLib.Error {
@@ -277,11 +277,11 @@ public class Application.PluginManager : GLib.Object {
         return info.get_module_name() in AUTOLOAD_MODULES;
     }
 
-    internal Gee.Collection<NotificationContext> get_notification_contexts() {
+    internal Gee.Collection<NotificationPluginContext> get_notification_contexts() {
         return this.notification_contexts.values.read_only_view;
     }
 
-    internal Gee.Collection<EmailContext> get_email_contexts() {
+    internal Gee.Collection<EmailPluginContext> get_email_contexts() {
         return this.email_contexts.values.read_only_view;
     }
 
@@ -310,7 +310,7 @@ public class Application.PluginManager : GLib.Object {
 
             var notification = plugin as Plugin.NotificationExtension;
             if (notification != null) {
-                var context = new NotificationContext(
+                var context = new NotificationPluginContext(
                     this.application,
                     this.folders_factory,
                     this.email_factory
@@ -321,7 +321,7 @@ public class Application.PluginManager : GLib.Object {
 
             var email = plugin as Plugin.EmailExtension;
             if (email != null) {
-                var context = new EmailContext(
+                var context = new EmailPluginContext(
                     this.application,
                     this.email_factory,
                     plugin_application.action_group_name
@@ -332,7 +332,7 @@ public class Application.PluginManager : GLib.Object {
 
             var folder = plugin as Plugin.FolderExtension;
             if (folder != null) {
-                folder.folders = new FolderContext(
+                folder.folders = new FolderPluginContext(
                     this.application,
                     this.folders_factory,
                     plugin_application.action_group_name
@@ -406,7 +406,7 @@ public class Application.PluginManager : GLib.Object {
 
         var folder = context.plugin as Plugin.FolderExtension;
         if (folder != null) {
-            var folder_context = folder.folders as FolderContext;
+            var folder_context = folder.folders as FolderPluginContext;
             if (folder_context != null) {
                 folder_context.destroy();
             }
@@ -414,7 +414,7 @@ public class Application.PluginManager : GLib.Object {
 
         var email = context.plugin as Plugin.EmailExtension;
         if (email != null) {
-            var email_context = email.email as Application.EmailContext;
+            var email_context = email.email as EmailPluginContext;
             if (email_context != null) {
                 this.email_contexts.unset(context.info);
                 email_context.destroy();
diff --git a/src/client/meson.build b/src/client/meson.build
index 6f1d3014..c86e42ea 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -20,12 +20,12 @@ geary_client_vala_sources = files(
   'application/application-contact-store.vala',
   'application/application-contact.vala',
   'application/application-controller.vala',
-  'application/application-email-context.vala',
+  'application/application-email-plugin-context.vala',
   'application/application-email-store-factory.vala',
-  'application/application-folder-context.vala',
+  'application/application-folder-plugin-context.vala',
   'application/application-folder-store-factory.vala',
   'application/application-main-window.vala',
-  'application/application-notification-context.vala',
+  'application/application-notification-plugin-context.vala',
   'application/application-plugin-manager.vala',
   'application/application-startup-manager.vala',
   'application/goa-mediator.vala',