Commit 66d4e075 authored by Guido Gunther's avatar Guido Gunther
Browse files

Move the calls DBus interface to org.gnome.Calls



This changed with the move to upstream GNOME.
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
parent 8681e3ff
Pipeline #69761 passed with stages
in 95 minutes and 38 seconds
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "util.h" #include "util.h"
#include "dbus/calls-dbus.h" #include "dbus/calls-dbus.h"
#define BUS_NAME "sm.puri.Calls" #define BUS_NAME "org.gnome.Calls"
#define OBJECT_PATH "/sm/puri/Calls" #define OBJECT_PATH "/org/gnome/Calls"
#define OBJECT_PATHS_CALLS_PREFIX OBJECT_PATH "/Call/" #define OBJECT_PATHS_CALLS_PREFIX OBJECT_PATH "/Call/"
/** /**
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* @short_description: Track ongoing phone calls * @short_description: Track ongoing phone calls
* @Title: PhoshCallsManager * @Title: PhoshCallsManager
* *
* #PhoshCallsManager tracks on going calls on the sm.puri.Calls DBus * #PhoshCallsManager tracks on going calls on the org.gnome.Calls DBus
* interface and allows interaction with them by wrapping the * interface and allows interaction with them by wrapping the
* #PhoshCallsDBusCallsCall proxies in #PhoshCall so all DBus and * #PhoshCallsDBusCallsCall proxies in #PhoshCall so all DBus and
* ObjectManager related logic stays local within #PhoshCallsManager. * ObjectManager related logic stays local within #PhoshCallsManager.
......
...@@ -32,6 +32,11 @@ generated_dbus_sources += gnome.gdbus_codegen('phosh-wwan-mm-dbus', ...@@ -32,6 +32,11 @@ generated_dbus_sources += gnome.gdbus_codegen('phosh-wwan-mm-dbus',
namespace: 'Phosh_MM_DBus', namespace: 'Phosh_MM_DBus',
interface_prefix: 'org.freedesktop.ModemManager1', interface_prefix: 'org.freedesktop.ModemManager1',
object_manager: true) object_manager: true)
generated_dbus_sources += gnome.gdbus_codegen('calls-dbus',
'org.gnome.Calls.Call.xml',
object_manager: true,
interface_prefix: 'org.gnome',
namespace: 'PhoshCallsDBus')
# org.gnome.SessionManager # org.gnome.SessionManager
generated_dbus_sources += gnome.gdbus_codegen('gnome-session-dbus', generated_dbus_sources += gnome.gdbus_codegen('gnome-session-dbus',
'org.gnome.SessionManager.xml', 'org.gnome.SessionManager.xml',
...@@ -57,12 +62,6 @@ generated_dbus_sources += gnome.gdbus_codegen('mpris-dbus', ...@@ -57,12 +62,6 @@ generated_dbus_sources += gnome.gdbus_codegen('mpris-dbus',
'org.mpris.MediaPlayer2.xml', 'org.mpris.MediaPlayer2.xml',
interface_prefix: 'org.mpris', interface_prefix: 'org.mpris',
namespace: 'PhoshMprisDBus') namespace: 'PhoshMprisDBus')
# Calls
generated_dbus_sources += gnome.gdbus_codegen('calls-dbus',
'sm.puri.Calls.Call.xml',
object_manager: true,
interface_prefix: 'sm.puri',
namespace: 'PhoshCallsDBus')
generated_dbus_sources += gnome.gdbus_codegen('phosh-wwan-ofono-dbus', generated_dbus_sources += gnome.gdbus_codegen('phosh-wwan-ofono-dbus',
'org.ofono.xml', 'org.ofono.xml',
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<node> <node>
<interface name="sm.puri.Calls.Call"> <interface name="org.gnome.Calls.Call">
<method name="Accept"/> <method name="Accept"/>
<method name="Hangup"/> <method name="Hangup"/>
<property name="Inbound" type="b" access="read"/> <property name="Inbound" type="b" access="read"/>
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "testlib-full-shell.h" #include "testlib-full-shell.h"
#include "calls-dbus.h" #include "calls-dbus.h"
#define BUS_NAME "sm.puri.Calls" #define BUS_NAME "org.gnome.Calls"
#define OBJECT_PATH "/sm/puri/Calls" #define OBJECT_PATH "/org/gnome/Calls"
#define POP_TIMEOUT 50000000 #define POP_TIMEOUT 50000000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment