[gnome-panel] modules: use reverse DNS notation for module id

[Alberts Muktupāvels <muktupavels src gnome org>]

commit c7952a6b9c68a0d9ffaf89f003bb90144a0e8de0
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Jul 31 13:53:22 2017 +0300

    modules: use reverse DNS notation for module id

 modules/clock/clock-module.c          |    6 ++++--
 modules/fish/fish-module.c            |    6 ++++--
 modules/notification-area/na-module.c |    6 ++++--
 modules/separator/separator-module.c  |    6 ++++--
 modules/status-notifier/sn-module.c   |   14 ++++++++++++--
 modules/wncklet/wncklet-module.c      |   15 ++++++++++-----
 6 files changed, 38 insertions(+), 15 deletions(-)
---
diff --git a/modules/clock/clock-module.c b/modules/clock/clock-module.c
index 784635c..8bf1162 100644
--- a/modules/clock/clock-module.c
+++ b/modules/clock/clock-module.c
@@ -30,7 +30,8 @@ clock_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("clock", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.clock",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "clock", NULL);
 
@@ -60,7 +61,8 @@ clock_get_applet_type (const gchar *applet)
 static const gchar *
 clock_get_applet_from_iid (const gchar *iid)
 {
-  if (g_strcmp0 (iid, "ClockAppletFactory::ClockApplet") == 0)
+  if (g_strcmp0 (iid, "ClockAppletFactory::ClockApplet") == 0 ||
+      g_strcmp0 (iid, "clock::clock") == 0)
     return "clock";
 
   return NULL;
diff --git a/modules/fish/fish-module.c b/modules/fish/fish-module.c
index a919ad4..13304eb 100644
--- a/modules/fish/fish-module.c
+++ b/modules/fish/fish-module.c
@@ -30,7 +30,8 @@ fish_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("fish", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.fish",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "fish", NULL);
 
@@ -60,7 +61,8 @@ fish_get_applet_type (const gchar *applet)
 static const gchar *
 fish_get_applet_from_iid (const gchar *iid)
 {
-  if (g_strcmp0 (iid, "FishAppletFactory::FishApplet") == 0)
+  if (g_strcmp0 (iid, "FishAppletFactory::FishApplet") == 0 ||
+      g_strcmp0 (iid, "fish::fish") == 0)
     return "fish";
 
   return NULL;
diff --git a/modules/notification-area/na-module.c b/modules/notification-area/na-module.c
index dd75696..ef460e7 100644
--- a/modules/notification-area/na-module.c
+++ b/modules/notification-area/na-module.c
@@ -30,7 +30,8 @@ na_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("notification-area", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.notification-area",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "notification-area", NULL);
 
@@ -60,7 +61,8 @@ na_get_applet_type (const gchar *applet)
 static const gchar *
 na_get_applet_from_iid (const gchar *iid)
 {
-  if (g_strcmp0 (iid, "NotificationAreaAppletFactory::NotificationArea") == 0)
+  if (g_strcmp0 (iid, "NotificationAreaAppletFactory::NotificationArea") == 0 ||
+      g_strcmp0 (iid, "notification-area::notification-area") == 0)
     return "notification-area";
 
   return NULL;
diff --git a/modules/separator/separator-module.c b/modules/separator/separator-module.c
index e7c76ed..847c178 100644
--- a/modules/separator/separator-module.c
+++ b/modules/separator/separator-module.c
@@ -30,7 +30,8 @@ separator_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("separator", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.separator",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "separator", NULL);
 
@@ -54,7 +55,8 @@ separator_get_applet_type (const gchar *applet)
 static const gchar *
 separator_get_applet_from_iid (const gchar *iid)
 {
-  if (g_strcmp0 (iid, "PanelInternalFactory::Separator") == 0)
+  if (g_strcmp0 (iid, "PanelInternalFactory::Separator") == 0 ||
+      g_strcmp0 (iid, "separator::separator") == 0)
     return "separator";
 
   return NULL;
diff --git a/modules/status-notifier/sn-module.c b/modules/status-notifier/sn-module.c
index 290d93e..8904315 100644
--- a/modules/status-notifier/sn-module.c
+++ b/modules/status-notifier/sn-module.c
@@ -30,7 +30,8 @@ sn_get_module_info (void)
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  info = gp_module_info_new ("status-notifier", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.status-notifier",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "status-notifier", NULL);
 
@@ -56,6 +57,15 @@ sn_get_applet_type (const gchar *applet)
   return SN_TYPE_APPLET;
 }
 
+static const gchar *
+sn_get_applet_from_iid (const gchar *iid)
+{
+  if (g_strcmp0 (iid, "status-notifier::status-notifier") == 0)
+    return "status-notifier";
+
+  return NULL;
+}
+
 guint32
 gp_module_get_abi_version (void)
 {
@@ -69,7 +79,7 @@ gp_module_get_vtable (GpModuleVTable *vtable)
     sn_get_module_info,
     sn_get_applet_info,
     sn_get_applet_type,
-    NULL,
+    sn_get_applet_from_iid,
     NULL
   };
 }
diff --git a/modules/wncklet/wncklet-module.c b/modules/wncklet/wncklet-module.c
index 04752b9..0b6e8e7 100644
--- a/modules/wncklet/wncklet-module.c
+++ b/modules/wncklet/wncklet-module.c
@@ -36,7 +36,8 @@ wncklet_get_module_info (void)
 
   wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER);
 
-  info = gp_module_info_new ("wncklet", PACKAGE_VERSION, GETTEXT_PACKAGE);
+  info = gp_module_info_new ("org.gnome.gnome-panel.wncklet",
+                             PACKAGE_VERSION, GETTEXT_PACKAGE);
 
   gp_module_info_set_applets (info, "show-desktop", "window-list",
                               "window-menu", "workspace-switcher",
@@ -117,13 +118,17 @@ wncklet_get_applet_type (const gchar *applet)
 static const gchar *
 wncklet_get_applet_from_iid (const gchar *iid)
 {
-  if (g_strcmp0 (iid, "WnckletFactory::ShowDesktopApplet") == 0)
+  if (g_strcmp0 (iid, "WnckletFactory::ShowDesktopApplet") == 0 ||
+      g_strcmp0 (iid, "wncklet::show-desktop") == 0)
     return "show-desktop";
-  else if (g_strcmp0 (iid, "WnckletFactory::WindowListApplet") == 0)
+  else if (g_strcmp0 (iid, "WnckletFactory::WindowListApplet") == 0 ||
+           g_strcmp0 (iid, "wncklet::window-list") == 0)
     return "window-list";
-  else if (g_strcmp0 (iid, "WnckletFactory::WindowMenuApplet") == 0)
+  else if (g_strcmp0 (iid, "WnckletFactory::WindowMenuApplet") == 0 ||
+           g_strcmp0 (iid, "wncklet::window-menu") == 0)
     return "window-menu";
-  else if (g_strcmp0 (iid, "WnckletFactory::WorkspaceSwitcherApplet") == 0)
+  else if (g_strcmp0 (iid, "WnckletFactory::WorkspaceSwitcherApplet") == 0 ||
+           g_strcmp0 (iid, "wncklet::workspace-switcher") == 0)
     return "workspace-switcher";
 
   return NULL;