[geary/mjog/plugin-api-update: 3/3] Plugin.EmailExtension, Plugin.FolderExtension: API update

[Michael Gratton <mjog src gnome org>]

commit 111c5d0b91606f4f70ace885e7eb58d4b81c2612
Author: Michael Gratton <mike vee net>
Date:   Mon Mar 23 00:33:15 2020 +1100

    Plugin.EmailExtension, Plugin.FolderExtension: API update
    
    Rename store accessors to be explicit about that, and to avoid
    ambiguity with extension context property names.

 src/client/application/application-email-context.vala              | 2 +-
 src/client/application/application-folder-context.vala             | 2 +-
 src/client/plugin/desktop-notifications/desktop-notifications.vala | 4 ++--
 src/client/plugin/folder-highlight/folder-highlight.vala           | 2 +-
 src/client/plugin/messaging-menu/messaging-menu.vala               | 2 +-
 src/client/plugin/notification-badge/notification-badge.vala       | 2 +-
 src/client/plugin/plugin-email-extension.vala                      | 2 +-
 src/client/plugin/plugin-folder-extension.vala                     | 2 +-
 src/client/plugin/sent-sound/sent-sound.vala                       | 2 +-
 src/client/plugin/special-folders/special-folders.vala             | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/client/application/application-email-context.vala 
b/src/client/application/application-email-context.vala
index 759ff815..32db1618 100644
--- a/src/client/application/application-email-context.vala
+++ b/src/client/application/application-email-context.vala
@@ -27,7 +27,7 @@ internal class Application.EmailContext :
         this.action_group_name = action_group_name;
     }
 
-    public async Plugin.EmailStore get_email()
+    public async Plugin.EmailStore get_email_store()
         throws Plugin.Error.PERMISSION_DENIED {
         return this.email;
     }
diff --git a/src/client/application/application-folder-context.vala 
b/src/client/application/application-folder-context.vala
index 395046eb..4444cf3d 100644
--- a/src/client/application/application-folder-context.vala
+++ b/src/client/application/application-folder-context.vala
@@ -27,7 +27,7 @@ internal class Application.FolderContext :
         this.action_group_name = action_group_name;
     }
 
-    public async Plugin.FolderStore get_folders()
+    public async Plugin.FolderStore get_folder_store()
         throws Plugin.Error.PERMISSION_DENIED {
         return this.folders;
     }
diff --git a/src/client/plugin/desktop-notifications/desktop-notifications.vala 
b/src/client/plugin/desktop-notifications/desktop-notifications.vala
index 301564e0..e5fa7edd 100644
--- a/src/client/plugin/desktop-notifications/desktop-notifications.vala
+++ b/src/client/plugin/desktop-notifications/desktop-notifications.vala
@@ -59,12 +59,12 @@ public class Plugin.DesktopNotifications :
 
     public override async void activate() throws GLib.Error {
         this.cancellable = new GLib.Cancellable();
-        this.email_store = yield this.email.get_email();
+        this.email_store = yield this.email.get_email_store();
 
         this.notifications.new_messages_arrived.connect(on_new_messages_arrived);
         this.notifications.new_messages_retired.connect(on_new_messages_retired);
 
-        FolderStore folder_store = yield this.folders.get_folders();
+        FolderStore folder_store = yield this.folders.get_folder_store();
         folder_store.folders_available.connect(
             (folders) => check_folders(folders)
         );
diff --git a/src/client/plugin/folder-highlight/folder-highlight.vala 
b/src/client/plugin/folder-highlight/folder-highlight.vala
index bd8cdd81..67dc557c 100644
--- a/src/client/plugin/folder-highlight/folder-highlight.vala
+++ b/src/client/plugin/folder-highlight/folder-highlight.vala
@@ -47,7 +47,7 @@ public class Plugin.FolderHighlight :
         this.notifications.new_messages_arrived.connect(on_new_messages_arrived);
         this.notifications.new_messages_retired.connect(on_new_messages_retired);
 
-        FolderStore folder_store = yield this.folders.get_folders();
+        FolderStore folder_store = yield this.folders.get_folder_store();
         folder_store.folders_available.connect(
             (folders) => check_folders(folders)
         );
diff --git a/src/client/plugin/messaging-menu/messaging-menu.vala 
b/src/client/plugin/messaging-menu/messaging-menu.vala
index 32d7bb59..145c196b 100644
--- a/src/client/plugin/messaging-menu/messaging-menu.vala
+++ b/src/client/plugin/messaging-menu/messaging-menu.vala
@@ -43,7 +43,7 @@ public class Plugin.MessagingMenu :
         this.notifications.new_messages_arrived.connect(on_new_messages_changed);
         this.notifications.new_messages_retired.connect(on_new_messages_changed);
 
-        this.folder_store = yield this.folders.get_folders();
+        this.folder_store = yield this.folders.get_folder_store();
         this.folder_store.folders_available.connect(
             (folders) => check_folders(folders)
         );
diff --git a/src/client/plugin/notification-badge/notification-badge.vala 
b/src/client/plugin/notification-badge/notification-badge.vala
index e1a2af3a..d0321b37 100644
--- a/src/client/plugin/notification-badge/notification-badge.vala
+++ b/src/client/plugin/notification-badge/notification-badge.vala
@@ -57,7 +57,7 @@ public class Plugin.NotificationBadge :
             global::Application.Client.APP_ID + ".desktop"
         );
 
-        FolderStore folder_store = yield this.folders.get_folders();
+        FolderStore folder_store = yield this.folders.get_folder_store();
         folder_store.folders_available.connect(
             (folders) => check_folders(folders)
         );
diff --git a/src/client/plugin/plugin-email-extension.vala b/src/client/plugin/plugin-email-extension.vala
index 77ce0dd2..c439296a 100644
--- a/src/client/plugin/plugin-email-extension.vala
+++ b/src/client/plugin/plugin-email-extension.vala
@@ -47,7 +47,7 @@ public interface Plugin.EmailContext : Geary.BaseObject {
      * @throws Error.PERMISSIONS if permission to access
      * this resource was not given
      */
-    public abstract async EmailStore get_email()
+    public abstract async EmailStore get_email_store()
         throws Error.PERMISSION_DENIED;
 
     /**
diff --git a/src/client/plugin/plugin-folder-extension.vala b/src/client/plugin/plugin-folder-extension.vala
index eee857a0..37b19d04 100644
--- a/src/client/plugin/plugin-folder-extension.vala
+++ b/src/client/plugin/plugin-folder-extension.vala
@@ -47,7 +47,7 @@ public interface Plugin.FolderContext : Geary.BaseObject {
      * @throws Error.PERMISSIONS if permission to access
      * this resource was not given
      */
-    public abstract async FolderStore get_folders()
+    public abstract async FolderStore get_folder_store()
         throws Error.PERMISSION_DENIED;
 
     /**
diff --git a/src/client/plugin/sent-sound/sent-sound.vala b/src/client/plugin/sent-sound/sent-sound.vala
index 650a9ae5..cd1c178c 100644
--- a/src/client/plugin/sent-sound/sent-sound.vala
+++ b/src/client/plugin/sent-sound/sent-sound.vala
@@ -31,7 +31,7 @@ public class Plugin.SentSound : PluginBase, EmailExtension {
         this.context = new GSound.Context();
         this.context.init();
 
-        this.store = yield this.email.get_email();
+        this.store = yield this.email.get_email_store();
         this.store.email_sent.connect(on_sent);
     }
 
diff --git a/src/client/plugin/special-folders/special-folders.vala 
b/src/client/plugin/special-folders/special-folders.vala
index 6896294a..ee32714d 100644
--- a/src/client/plugin/special-folders/special-folders.vala
+++ b/src/client/plugin/special-folders/special-folders.vala
@@ -49,7 +49,7 @@ public class Plugin.SpecialFolders :
 
 
     public override async void activate() throws GLib.Error {
-        this.folder_store = yield this.folders.get_folders();
+        this.folder_store = yield this.folders.get_folder_store();
         this.folder_store.folder_selected.connect(on_folder_selected);
         this.folder_store.folders_type_changed.connect(on_folders_type_changed);
 
@@ -59,7 +59,7 @@ public class Plugin.SpecialFolders :
         this.empty_action.activate.connect(on_empty_activated);
         this.plugin_application.register_action(this.empty_action);
 
-        this.email_store = yield this.email.get_email();
+        this.email_store = yield this.email.get_email_store();
         this.email_store.email_displayed.connect(on_email_displayed);
     }