From 69b919d7ab58399fd3c41db6763bfa371fa8c034 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sat, 10 Jul 2021 04:27:42 +0200 Subject: [PATCH] DBus: Use org.gnome prefix and adapt to changes In preparation to moving to GNOME all the IDs, DBus object paths, etc should change. --- doc/calls-docs.xml | 2 +- src/calls-dbus-manager.c | 4 ++-- src/dbus/meson.build | 4 ++-- src/dbus/{sm.puri.Calls.Call.xml => org.gnome.Calls.Call.xml} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/dbus/{sm.puri.Calls.Call.xml => org.gnome.Calls.Call.xml} (97%) diff --git a/doc/calls-docs.xml b/doc/calls-docs.xml index f2e6b57..2585ff9 100644 --- a/doc/calls-docs.xml +++ b/doc/calls-docs.xml @@ -37,7 +37,7 @@ DBus interfaces - + diff --git a/src/calls-dbus-manager.c b/src/calls-dbus-manager.c index 9bced16..5ea9b3c 100644 --- a/src/calls-dbus-manager.c +++ b/src/calls-dbus-manager.c @@ -22,8 +22,8 @@ * The #CallsCallManager is responsible for exposing the * call objects on the session bus using #GDBusObjectManager. * - * Call objects are exported like /sm/puri/Calls/ as - * /sm/puri/Calls/Call/1, /sm/puri/Calls/Call/2, … using + * Call objects are exported like /org/gnome/Calls/ as + * /org/gnome/Calls/Call/1, /org/gnome/Calls/Call/2, … using * org.freedesktop.DBus.ObjectManager. */ diff --git a/src/dbus/meson.build b/src/dbus/meson.build index 64839f3..d87de30 100644 --- a/src/dbus/meson.build +++ b/src/dbus/meson.build @@ -2,8 +2,8 @@ generated_dbus_sources = [] # DBus server protocols generated_dbus_sources += gnome.gdbus_codegen('calls-call-dbus', - 'sm.puri.Calls.Call.xml', + 'org.gnome.Calls.Call.xml', docbook: 'calls', - interface_prefix: 'sm.puri', + interface_prefix: 'org.gnome', object_manager: true, namespace: 'CallsDBus') diff --git a/src/dbus/sm.puri.Calls.Call.xml b/src/dbus/org.gnome.Calls.Call.xml similarity index 97% rename from src/dbus/sm.puri.Calls.Call.xml rename to src/dbus/org.gnome.Calls.Call.xml index 78ecafb..f8ca6fd 100644 --- a/src/dbus/sm.puri.Calls.Call.xml +++ b/src/dbus/org.gnome.Calls.Call.xml @@ -21,7 +21,7 @@ - +