[gnome-settings-daemon/benzea/systemd-3-36: 82/83] meson: Use reverse domain name for unit names

[Benjamin Berg <bberg src gnome org>]

commit 89efac4f021c1b49ba5b84d0ead70c1c0dfa609e
Author: Benjamin Berg <bberg redhat com>
Date:   Mon Feb 3 13:31:41 2020 +0100

    meson: Use reverse domain name for unit names
    
    This means the .desktop and the systemd unit files are named
    consistently.

 plugins/gsd.service.in | 6 +++---
 plugins/gsd.target.in  | 2 +-
 plugins/meson.build    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/gsd.service.in b/plugins/gsd.service.in
index 31fa3e96..6327fd3c 100644
--- a/plugins/gsd.service.in
+++ b/plugins/gsd.service.in
@@ -8,9 +8,9 @@ After=gnome-session-initialized.target
 
 # Requisite/PartOf means the dependency is not loaded automatically.
 # The ordering here also implies Before=gnome-session.target
-Requisite=gsd-@plugin_name@.target
-PartOf=gsd-@plugin_name@.target
-Before=gsd-@plugin_name@.target
+Requisite=@plugin_dbus_name@.target
+PartOf=@plugin_dbus_name@.target
+Before=@plugin_dbus_name@.target
 
 @plugin_gate_units_section@
 
diff --git a/plugins/gsd.target.in b/plugins/gsd.target.in
index 407207a4..137df207 100644
--- a/plugins/gsd.target.in
+++ b/plugins/gsd.target.in
@@ -3,7 +3,7 @@ Description=@description@ target
 CollectMode=inactive-or-failed
 
 # Pull in the service
-Wants=gsd-@plugin_name@.service
+Wants=@plugin_dbus_name@.service
 
 # Require GNOME session and specify startup ordering
 Requisite=gnome-session-initialized.target
diff --git a/plugins/meson.build b/plugins/meson.build
index 8af04040..b91bae66 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -106,8 +106,8 @@ foreach plugin: all_plugins
     )
 
     if not disabled_plugins.contains(plugin_name)
-        user_target = 'gsd-@0@.target'.format(plugin_name)
-        user_service = 'gsd-@0@.service'.format(plugin_name)
+        user_target = 'org.gnome.SettingsDaemon.@0@.target'.format(plugin[1])
+        user_service = 'org.gnome.SettingsDaemon.@0@.service'.format(plugin[1])
 
         unit_conf = configuration_data()
         unit_conf.set('plugin_name', plugin_name)