modem/call: add MODEM_OFACE_CALL_MANAGER and MODEM_OFACE_CALL

3 files changed, 34 insertions, 8 deletions

diff --git a/modem/call-service.c b/modem/call-service.c
index 96529af..b512420 100644
--- a/modem/call-service.c
+++ b/modem/call-service.c
@@ -90,6 +90,22 @@ struct _ModemCallServicePrivate
 
 /* ---------------------------------------------------------------------- */
 
+GQuark
+modem_oface_quark_call_manager (void)
+{
+  static gsize quark = 0;
+
+  if (g_once_init_enter (&quark))
+    {
+      GQuark q = g_quark_from_static_string (MODEM_OFACE_CALL_MANAGER);
+      g_once_init_leave (&quark, q);
+    }
+
+  return quark;
+}
+
+/* ---------------------------------------------------------------------- */
+
 static void modem_call_service_connect_to_instance (ModemCallService *self,
     ModemCall *ci);
 
@@ -365,6 +381,7 @@ modem_call_service_class_init (ModemCallServiceClass *klass)
   object_class->dispose = modem_call_service_dispose;
   object_class->finalize = modem_call_service_finalize;
 
+  oface_class->ofono_interface = MODEM_OFACE_CALL_MANAGER;
   oface_class->property_mapper = modem_call_service_property_mapper;
   oface_class->connect = modem_call_service_connect;
   oface_class->disconnect = modem_call_service_disconnect;
@@ -973,7 +990,7 @@ modem_call_request_dial_reply (DBusGProxy *proxy,
 
   if (ci)
     {
-      DEBUG ("%s: instance %s (%p)", OFONO_IFACE_CALL_MANAGER ".Dial",
+      DEBUG ("%s: instance %s (%p)", MODEM_OFACE_CALL_MANAGER ".Dial",
           object_path, (void *)ci);
 
       modem_message (MODEM_SERVICE_CALL,
@@ -991,7 +1008,7 @@ modem_call_request_dial_reply (DBusGProxy *proxy,
           modem_error_name (error, ebuffer, sizeof ebuffer),
           error->message);
 
-      DEBUG ("%s: " GERROR_MSG_FMT, OFONO_IFACE_CALL_MANAGER ".Dial",
+      DEBUG ("%s: " GERROR_MSG_FMT, MODEM_OFACE_CALL_MANAGER ".Dial",
           GERROR_MSG_CODE (error));
     }
 
diff --git a/modem/call.c b/modem/call.c
index 14808b9..0b6995b 100644
--- a/modem/call.c
+++ b/modem/call.c
@@ -145,7 +145,7 @@ modem_call_constructed (GObject *object)
     G_OBJECT_CLASS (modem_call_parent_class)->constructed (object);
 
   DEBUG ("ModemCall for %s on %s",
-      modem_oface_object_path (MODEM_OFACE (object)), OFONO_IFACE_CALL);
+      modem_oface_object_path (MODEM_OFACE (object)), MODEM_OFACE_CALL);
 }
 
 static void
@@ -369,6 +369,7 @@ modem_call_class_init (ModemCallClass *klass)
   object_class->get_property = modem_call_get_property;
   object_class->set_property = modem_call_set_property;
 
+  oface_class->ofono_interface = MODEM_OFACE_CALL;
   oface_class->property_mapper = modem_call_property_mapper;
   oface_class->connect = modem_call_connect;
   oface_class->connected = modem_call_connected;
@@ -803,7 +804,7 @@ modem_call_request_answer (ModemCall *self,
 
   if (self->priv->state != MODEM_CALL_STATE_WAITING)
     {
-      DEBUG ("%s.%s (%s)", OFONO_IFACE_CALL, "Answer",
+      DEBUG ("%s.%s (%s)", MODEM_OFACE_CALL, "Answer",
           modem_call_get_path (self));
       return modem_request (MODEM_CALL (self),
           modem_oface_dbus_proxy (MODEM_OFACE (self)),
@@ -812,7 +813,7 @@ modem_call_request_answer (ModemCall *self,
           G_TYPE_INVALID);
     }
   else {
-    DEBUG ("%s.%s (%s)", OFONO_IFACE_CALL_MANAGER, "HoldAndAnswer",
+    DEBUG ("%s.%s (%s)", MODEM_OFACE_CALL_MANAGER, "HoldAndAnswer",
         modem_call_get_path (self));
     return modem_request (MODEM_CALL (self),
         modem_oface_dbus_proxy (MODEM_OFACE (self->priv->service)),
@@ -827,7 +828,7 @@ modem_call_request_release (ModemCall *self,
                             ModemCallReply callback,
                             gpointer user_data)
 {
-  DEBUG ("%s.%s (%s)", OFONO_IFACE_CALL, "Hangup", modem_call_get_path (self));
+  DEBUG ("%s.%s (%s)", MODEM_OFACE_CALL, "Hangup", modem_call_get_path (self));
   RETURN_NULL_IF_NOT_VALID (self);
 
   return modem_request (MODEM_CALL (self),
@@ -843,7 +844,7 @@ modem_call_request_split (ModemCall *self,
                           ModemCallReply callback,
                           gpointer user_data)
 {
-  DEBUG ("%s.%s (%s)", OFONO_IFACE_CALL_MANAGER, "PrivateChat",
+  DEBUG ("%s.%s (%s)", MODEM_OFACE_CALL_MANAGER, "PrivateChat",
       modem_call_get_path (self));
   RETURN_NULL_IF_NOT_VALID (self);
 
@@ -864,7 +865,7 @@ modem_call_request_hold (ModemCall *self,
   /* XXX: */
   (void)hold;
 
-  DEBUG ("%s.%s", OFONO_IFACE_CALL_MANAGER, "SwapCalls");
+  DEBUG ("%s.%s", MODEM_OFACE_CALL_MANAGER, "SwapCalls");
   RETURN_NULL_IF_NOT_VALID (self);
 
   return modem_request (MODEM_CALL (self),
diff --git a/modem/call.h b/modem/call.h
index 862d54f..f9a9b58 100644
--- a/modem/call.h
+++ b/modem/call.h
@@ -132,6 +132,14 @@ GType modem_call_conference_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
       MODEM_TYPE_CALL_CONFERENCE, ModemCallConferenceClass))
 
+/* ------------------------------------------------------------------------- */
+
+#define MODEM_OFACE_CALL_MANAGER "org.ofono.VoiceCallManager"
+#define MODEM_OFACE_CALL         "org.ofono.VoiceCall"
+
+#define MODEM_OFACE_QUARK_CALL_MANAGER modem_oface_quark_call_manager ()
+GQuark modem_oface_quark_call_manager (void);
+
 /**
  * Call properties
  */