[epiphany/mwleeds/webapp-dbus-api: 58/69] webapp-provider: Use consistent D-Bus name

[Phaedrus Leeds <mwleeds src gnome org>]

commit 56dbf7c3e79ff722a1c3b67afa7b6f4c080dd53f
Author: Phaedrus Leeds <mwleeds protonmail com>
Date:   Mon Dec 13 11:45:03 2021 -0800

    webapp-provider: Use consistent D-Bus name

 data/meson.build                                  | 2 +-
 data/org.gnome.Epiphany.WebAppProvider.service.in | 2 +-
 org.gnome.Epiphany.json                           | 3 ++-
 src/webapp-provider/ephy-webapp-provider.c        | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 4d677fce7..3108a0060 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -98,7 +98,7 @@ configure_file(
 
 configure_file(
   input: 'org.gnome.Epiphany.WebAppProvider.service.in',
-  output: '@0@.WebAppProvider.service'.format(application_id),
+  output: 'org.gnome.Epiphany.WebAppProvider.service',
   configuration: service_conf,
   install_dir: servicedir
 )
diff --git a/data/org.gnome.Epiphany.WebAppProvider.service.in 
b/data/org.gnome.Epiphany.WebAppProvider.service.in
index de411d239..1ab1699a6 100644
--- a/data/org.gnome.Epiphany.WebAppProvider.service.in
+++ b/data/org.gnome.Epiphany.WebAppProvider.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=@appid@.WebAppProvider
+Name=org.gnome.Epiphany.WebAppProvider
 Exec=@libexecdir@/epiphany-webapp-provider
diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json
index 78ef33483..e0dddbf79 100644
--- a/org.gnome.Epiphany.json
+++ b/org.gnome.Epiphany.json
@@ -17,7 +17,8 @@
         "--socket=fallback-x11",
         "--socket=pulseaudio",
         "--socket=wayland",
-        "--system-talk-name=org.freedesktop.GeoClue2"
+        "--system-talk-name=org.freedesktop.GeoClue2",
+        "--own-name=org.gnome.Epiphany.WebAppProvider"
     ],
     "modules" : [
          {
diff --git a/src/webapp-provider/ephy-webapp-provider.c b/src/webapp-provider/ephy-webapp-provider.c
index 24f086c66..0044e6469 100644
--- a/src/webapp-provider/ephy-webapp-provider.c
+++ b/src/webapp-provider/ephy-webapp-provider.c
@@ -233,7 +233,9 @@ ephy_web_app_provider_service_class_init (EphyWebAppProviderServiceClass *klass)
 EphyWebAppProviderService *
 ephy_web_app_provider_service_new (void)
 {
-  g_autofree gchar *app_id = g_strconcat (APPLICATION_ID, ".WebAppProvider", NULL);
+  /* Note the application ID is constant for release/devel/canary builds
+   * because we want to always use the same well-known D-Bus name */
+  g_autofree gchar *app_id = g_strconcat ("org.gnome.Epiphany.WebAppProvider", NULL);
 
   return g_object_new (EPHY_TYPE_WEB_APP_PROVIDER_SERVICE,
                        "application-id", app_id,