diff options
| author |   Matt Porter <mporter@konsulko.com> | 2017-08-08 09:05:14 -0400 |
|---|---|---|
| committer |   Matt Ranostay <matt.ranostay@konsulko.com> | 2017-09-26 12:00:31 -0700 |
| commit | edae16e793b2ef2dd680821357128b5165b34b78 (patch) | |
| tree | 7d55f199b86853f46cd2adf865bc4639cf79da2e /telephony-binding/gdbus/ofono_voicecallmanager.c | |
| parent | 8d587e0062c6d6373e7e2102423562391fcd14f2 (diff) | |
telephony-binding: convert to v2 binding
Convert the telephony-binding to the v2 binding format.
Also move to AFB_ message macros and remove propagation
of the interface struct.
Bug-AGL: SPEC-814 SPEC-913
Change-Id: Ic9ce86f59af01ce00cece4e29cd5fe36afa7d74c
Signed-off-by: Matt Porter <mporter@konsulko.com>
Diffstat (limited to 'telephony-binding/gdbus/ofono_voicecallmanager.c')
| -rw-r--r-- | telephony-binding/gdbus/ofono_voicecallmanager.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/telephony-binding/gdbus/ofono_voicecallmanager.c b/telephony-binding/gdbus/ofono_voicecallmanager.c index aab4f69..76cf409 100644 --- a/telephony-binding/gdbus/ofono_voicecallmanager.c +++ b/telephony-binding/gdbus/ofono_voicecallmanager.c @@ -18,12 +18,11 @@ #include <string.h> +#define AFB_BINDING_VERSION 2 #include <afb/afb-binding.h> #include "ofono_voicecallmanager_interface.h" -static const struct afb_binding_interface *interface; - static void call_added(OrgOfonoVoiceCallManager *manager, gchar *op, GVariant *properties) @@ -58,14 +57,11 @@ static void call_removed(OrgOfonoVoiceCallManager *manager, const OrgOfonoVoiceCallManager -*ofono_voicecallmanager_init(const struct afb_binding_interface *iface, - const gchar *op, +*ofono_voicecallmanager_init(const gchar *op, void (*incoming_call)(OrgOfonoVoiceCallManager *manager,gchar *,gchar *), void (*dialing_call)(OrgOfonoVoiceCallManager *manager,gchar *,gchar *), void (*terminated_call)(OrgOfonoVoiceCallManager *manager,gchar *)) { - interface = iface; - OrgOfonoVoiceCallManager *manager = org_ofono_voice_call_manager_proxy_new_for_bus_sync( G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, "org.ofono", op, NULL, NULL); @@ -106,23 +102,23 @@ const OrgOfonoVoiceCallManager G_TYPE_STRING); if (g_signal_connect(G_OBJECT(manager), "incoming-call", G_CALLBACK(incoming_call), NULL) <= 0) { - ERROR(interface, "Failed to connect to signal incoming-call\n"); + AFB_ERROR("Failed to connect to signal incoming-call\n"); } if (g_signal_connect(G_OBJECT(manager), "dialing-call", G_CALLBACK(dialing_call), NULL) <= 0) { - ERROR(interface, "Failed to connect to signal dialing-call\n"); + AFB_ERROR("Failed to connect to signal dialing-call\n"); } if (g_signal_connect(G_OBJECT(manager), "terminated-call", G_CALLBACK(terminated_call), NULL) <= 0) { - ERROR(interface, "Failed to connect to signal terminated-call\n"); + AFB_ERROR("Failed to connect to signal terminated-call\n"); } if (g_signal_connect(manager, "call-added", G_CALLBACK(call_added), NULL) <= 0) { - ERROR(interface, "Failed to connect to signal call-added\n"); + AFB_ERROR("Failed to connect to signal call-added\n"); } if (g_signal_connect(manager, "call-removed", G_CALLBACK(call_removed), NULL) <= 0) { - ERROR(interface, "Failed to connect to signal call-removed\n"); + AFB_ERROR("Failed to connect to signal call-removed\n"); } return manager; @@ -136,7 +132,7 @@ gchar *ofono_voicecallmanager_dial(OrgOfonoVoiceCallManager *manager, GError *error = NULL; if (!manager) { - ERROR(interface, "Ofono VoiceCallmanager uninitialized\n"); + AFB_ERROR("Ofono VoiceCallmanager uninitialized\n"); return NULL; } @@ -152,7 +148,7 @@ void ofono_voicecallmanager_hangup_all(OrgOfonoVoiceCallManager *manager) GError *error = NULL; if (!manager) { - ERROR(interface, "Ofono VoiceCallmanager uninitialized\n"); + AFB_ERROR("Ofono VoiceCallmanager uninitialized\n"); return; } |