m-default-nodes*: Remove suffixes in hooks name

Suffix is redundant for on events as Events names and Event chains are
printed with 847c0.

Update the settings file used.

modules/module-default-nodes-api.c

@@ -173,7 +173,7 @@ wp_default_nodes_api_enable (WpPlugin * plugin, WpTransition * transition)
   g_return_if_fail (dispatcher);
 
   /* default metadata added */
-  hook = wp_simple_event_hook_new ("default-nodes-api-on-metadata-added", 10,
+  hook = wp_simple_event_hook_new ("default-nodes", 10,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_added, self, NULL));
   wp_interest_event_hook_add_interest (WP_INTEREST_EVENT_HOOK (hook),
@@ -185,7 +185,7 @@ wp_default_nodes_api_enable (WpPlugin * plugin, WpTransition * transition)
   g_clear_object(&hook);
 
   /* default metadata changed */
-  hook = wp_simple_event_hook_new ("default-nodes-api-on-metadata-changed", 10,
+  hook = wp_simple_event_hook_new ("default-nodes", 10,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_changed_hook, self, NULL));
   wp_interest_event_hook_add_interest (WP_INTEREST_EVENT_HOOK (hook),

modules/module-default-nodes.c

@@ -39,6 +39,10 @@ enum {
  * default.configured.*(default-configured-nodes) keys.
  */
 
+/*
+ * settings file: device-settings.conf
+ */
+
 typedef struct _WpDefaultNode WpDefaultNode;
 struct _WpDefaultNode
 {
@@ -528,7 +532,7 @@ wp_default_nodes_enable (WpPlugin * plugin, WpTransition * transition)
   g_return_if_fail (dispatcher);
 
   /* default metadata added */
-  hook = wp_simple_event_hook_new ("default-nodes-on-metadata-added", 10,
+  hook = wp_simple_event_hook_new ("default-nodes", 10,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_added, self, NULL));
   wp_interest_event_hook_add_interest (WP_INTEREST_EVENT_HOOK (hook),
@@ -540,7 +544,7 @@ wp_default_nodes_enable (WpPlugin * plugin, WpTransition * transition)
   g_clear_object(&hook);
 
   /* default metadata changed */
-  hook = wp_simple_event_hook_new ("default-nodes-on-metadata-changed", 10,
+  hook = wp_simple_event_hook_new ("default-nodes", 10,
       WP_EVENT_HOOK_EXEC_TYPE_ON_EVENT,
       g_cclosure_new ((GCallback) on_metadata_changed, self, NULL));
   wp_interest_event_hook_add_interest (WP_INTEREST_EVENT_HOOK (hook),

src/scripts/create-item.lua

@@ -62,7 +62,7 @@ end
 AsyncEventHook {
   priority = 10,
   type = "on-event",
-  name = "create-item-node-added",
+  name = "create-item",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "object-added" },
@@ -140,7 +140,7 @@ AsyncEventHook {
 SimpleEventHook {
   priority = 10,
   type = "on-event",
-  name = "create-item-node-removed",
+  name = "create-item",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "object-removed" },

src/scripts/policy-node.lua

@@ -986,7 +986,7 @@ end
 
 SimpleEventHook {
   priority = 15,
-  name = "policy-handle-linkable",
+  name = "policy-node",
   type = "on-event",
   interests = {
     EventInterest {
@@ -1012,7 +1012,7 @@ SimpleEventHook {
 
 SimpleEventHook {
   priority = 5,
-  name = "policy-unhandle-linkable",
+  name = "policy-node",
   type = "on-event",
   interests = {
     EventInterest {
@@ -1031,7 +1031,7 @@ SimpleEventHook {
 
 SimpleEventHook {
   priority = 1,
-  name = "policy-rescanner",
+  name = "policy-node-rescanner",
   type = "after-events",
   interests = {
     -- on audio device node linkable addition