portal: Define constants for the D-Bus names and path

Signed-off-by: Simon McVittie <smcv@collabora.com>

3 files changed, 20 insertions, 13 deletions

diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c
index 5528b671..e0040e2a 100644
--- a/portal/flatpak-portal.c
+++ b/portal/flatpak-portal.c
@@ -230,8 +230,8 @@ child_watch_died (GPid     pid,
   signal_variant = g_variant_ref_sink (g_variant_new ("(uu)", pid, status));
   g_dbus_connection_emit_signal (session_bus,
                                  pid_data->client,
-                                 "/org/freedesktop/portal/Flatpak",
-                                 "org.freedesktop.portal.Flatpak",
+                                 FLATPAK_PORTAL_PATH,
+                                 FLATPAK_PORTAL_INTERFACE,
                                  "SpawnExited",
                                  signal_variant,
                                  NULL);
@@ -422,8 +422,8 @@ check_child_pid_status (void *user_data)
   signal_variant = g_variant_ref_sink (g_variant_new ("(uu)", pid, relative_child_pid));
   g_dbus_connection_emit_signal (session_bus,
                                  pid_data->client,
-                                 "/org/freedesktop/portal/Flatpak",
-                                 "org.freedesktop.portal.Flatpak",
+                                 FLATPAK_PORTAL_PATH,
+                                 FLATPAK_PORTAL_INTERFACE,
                                  "SpawnStarted",
                                  signal_variant,
                                  NULL);
@@ -813,7 +813,7 @@ handle_spawn (PortalFlatpak         *object,
     {
       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                              G_DBUS_ERROR_INVALID_ARGS,
-                                             "org.freedesktop.portal.Flatpak.Spawn only works in a flatpak");
+                                             FLATPAK_PORTAL_INTERFACE ".Spawn only works in a flatpak");
       return G_DBUS_METHOD_INVOCATION_HANDLED;
     }
 
@@ -1896,7 +1896,7 @@ check_for_updates (PortalFlatpakUpdateMonitor *monitor)
           !g_dbus_connection_emit_signal (update_monitor_get_connection (monitor),
                                           m->sender,
                                           m->obj_path,
-                                          "org.freedesktop.portal.Flatpak.UpdateMonitor",
+                                          FLATPAK_PORTAL_INTERFACE_UPDATE_MONITOR,
                                           "UpdateAvailable",
                                           g_variant_new ("(a{sv})", &builder),
                                           &error))
@@ -2014,7 +2014,8 @@ handle_create_update_monitor (PortalFlatpak *object,
         sender_escaped[i] = '_';
     }
 
-  obj_path = g_strdup_printf ("/org/freedesktop/portal/Flatpak/update_monitor/%s/%s",
+  obj_path = g_strdup_printf ("%s/update_monitor/%s/%s",
+                              FLATPAK_PORTAL_PATH,
                               sender_escaped,
                               token);
 
@@ -2315,7 +2316,7 @@ emit_progress (PortalFlatpakUpdateMonitor *monitor,
   if (!g_dbus_connection_emit_signal (connection,
                                       m->sender,
                                       m->obj_path,
-                                      "org.freedesktop.portal.Flatpak.UpdateMonitor",
+                                      FLATPAK_PORTAL_INTERFACE_UPDATE_MONITOR,
                                       "Progress",
                                       g_variant_new ("(a{sv})", &builder),
                                       &error))
@@ -2879,7 +2880,7 @@ on_bus_acquired (GDBusConnection *connection,
 
   if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (portal),
                                          connection,
-                                         "/org/freedesktop/portal/Flatpak",
+                                         FLATPAK_PORTAL_PATH,
                                          &error))
     {
       g_warning ("error: %s", error->message);
@@ -3041,7 +3042,7 @@ main (int    argc,
     flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
 
   name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                  "org.freedesktop.portal.Flatpak",
+                                  FLATPAK_PORTAL_BUS_NAME,
                                   flags,
                                   on_bus_acquired,
                                   on_name_acquired,
diff --git a/portal/flatpak-portal.h b/portal/flatpak-portal.h
index bf6e2a67..598a0286 100644
--- a/portal/flatpak-portal.h
+++ b/portal/flatpak-portal.h
@@ -21,6 +21,11 @@
 #ifndef __FLATPAK_PORTAL_H__
 #define __FLATPAK_PORTAL_H__
 
+#define FLATPAK_PORTAL_BUS_NAME "org.freedesktop.portal.Flatpak"
+#define FLATPAK_PORTAL_PATH "/org/freedesktop/portal/Flatpak"
+#define FLATPAK_PORTAL_INTERFACE FLATPAK_PORTAL_BUS_NAME
+#define FLATPAK_PORTAL_INTERFACE_UPDATE_MONITOR FLATPAK_PORTAL_BUS_NAME ".UpdateMonitor"
+
 typedef enum {
   FLATPAK_SPAWN_FLAGS_CLEAR_ENV = 1 << 0,
   FLATPAK_SPAWN_FLAGS_LATEST_VERSION = 1 << 1,
diff --git a/tests/test-update-portal.c b/tests/test-update-portal.c
index b7940a6c..8c8f4466 100644
--- a/tests/test-update-portal.c
+++ b/tests/test-update-portal.c
@@ -8,12 +8,13 @@
 #include <fcntl.h>
 
 #include <gio/gio.h>
+#include "portal/flatpak-portal.h"
 #include "portal/flatpak-portal-dbus.h"
 
 GDBusConnection *connection;
 
-const char *portal_name = "org.freedesktop.portal.Flatpak";
-const char *portal_path = "/org/freedesktop/portal/Flatpak";
+const char *portal_name = FLATPAK_PORTAL_BUS_NAME;
+const char *portal_path = FLATPAK_PORTAL_PATH;
 
 static PortalFlatpakUpdateMonitor *
 create_monitor (PortalFlatpak *portal,
@@ -36,7 +37,7 @@ create_monitor (PortalFlatpak *portal,
 
   token = g_strdup_printf ("test_token%d", counter++);
 
-  monitor_path = g_strdup_printf ("/org/freedesktop/portal/Flatpak/update_monitor/%s/%s", sender, token);
+  monitor_path = g_strdup_printf ("%s/update_monitor/%s/%s", FLATPAK_PORTAL_PATH, sender, token);
   monitor = portal_flatpak_update_monitor_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_NONE,
                                                           portal_name, monitor_path,
                                                           NULL, error);