[geary/mjog/user-plugins: 4/26] Plugins: Use module name as plugin names

[Michael Gratton <mjog src gnome org>]

commit f567777d4688148d7e094992f5ec1f6d7b7b3748
Author: Michael Gratton <mike vee net>
Date:   Mon Mar 2 12:02:12 2020 +1100

    Plugins: Use module name as plugin names
    
    Drop the library prefix and suffix from plugin module names, use that
    instead of the human-readable name in the plugin manager.

 src/client/application/application-plugin-manager.vala   | 16 +++++++---------
 .../desktop-notifications.plugin.in                      |  2 +-
 .../plugin/messaging-menu/messaging-menu.plugin.in       |  2 +-
 .../notification-badge/notification-badge.plugin.in      |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/client/application/application-plugin-manager.vala 
b/src/client/application/application-plugin-manager.vala
index 177b8a5c..ffc76de1 100644
--- a/src/client/application/application-plugin-manager.vala
+++ b/src/client/application/application-plugin-manager.vala
@@ -47,19 +47,17 @@ public class Application.PluginManager : GLib.Object {
                 }
             });
 
-        // Load built-in plugins by default
         foreach (Peas.PluginInfo info in this.engine.get_plugin_list()) {
+            string name = info.get_module_name();
             try {
-                info.is_available();
-                if (info.is_builtin()) {
-                    debug("Loading built-in plugin: %s", info.get_name());
-                    this.engine.load_plugin(info);
-                } else {
-                    debug("Not loading plugin: %s", info.get_name());
+                if (info.is_available()) {
+                    if (info.is_builtin()) {
+                        debug("Loading built-in plugin: %s", name);
+                        this.engine.load_plugin(info);
+                    }
                 }
             } catch (GLib.Error err) {
-                warning("Plugin %s not available: %s",
-                        info.get_name(), err.message);
+                warning("Plugin %s not available: %s", name, err.message);
             }
         }
     }
diff --git a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.in 
b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.in
index 837778b9..6c8c9f39 100644
--- a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.in
+++ b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.in
@@ -1,5 +1,5 @@
 [Plugin]
-Module=libdesktop-notifications.so
+Module=desktop-notifications
 Name=Desktop Notifications
 Description=Displays desktop notifications when new email is delivered
 Builtin=true
diff --git a/src/client/plugin/messaging-menu/messaging-menu.plugin.in 
b/src/client/plugin/messaging-menu/messaging-menu.plugin.in
index afa06422..f02a2e78 100644
--- a/src/client/plugin/messaging-menu/messaging-menu.plugin.in
+++ b/src/client/plugin/messaging-menu/messaging-menu.plugin.in
@@ -1,5 +1,5 @@
 [Plugin]
-Module=libmessaging-menu-geary.so
+Module=messaging-menu-geary
 Name=Messaging Menu
 Description=Displays Unity Messaging Menu notifications for new email
 Builtin=true
diff --git a/src/client/plugin/notification-badge/notification-badge.plugin.in 
b/src/client/plugin/notification-badge/notification-badge.plugin.in
index ca4fdfdf..611ec691 100644
--- a/src/client/plugin/notification-badge/notification-badge.plugin.in
+++ b/src/client/plugin/notification-badge/notification-badge.plugin.in
@@ -1,5 +1,5 @@
 [Plugin]
-Module=libnotification-badge.so
+Module=notification-badge
 Name=Notification Badge
 Description=Displays an application badge showing the number of unread messages
 Builtin=true