diff options
| author | Simon McVittie <smcv@collabora.com> | 2021-04-14 12:50:43 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2021-04-15 18:05:16 +0200 |
| commit | 70a3e44fb59acd9067ca8148931eb3e23acb15b1 (patch) | |
| tree | 35f7f8a2d12eacbaa06b769198f2c9fc3ebd2de4 /portal | |
| parent | f508cf1767315938a6cd06dec70ba264fe46d8ad (diff) | |
| download | flatpak-70a3e44fb59acd9067ca8148931eb3e23acb15b1.tar.gz | |
portal: Define constants for the D-Bus names and path
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'portal')
| -rw-r--r-- | portal/flatpak-portal.c | 21 | ||||
| -rw-r--r-- | portal/flatpak-portal.h | 5 |
2 files changed, 16 insertions, 10 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, |