summaryrefslogtreecommitdiffstats
path: root/telephony-binding/gdbus
diff options
context:
space:
mode:
Diffstat (limited to 'telephony-binding/gdbus')
-rw-r--r--telephony-binding/gdbus/ofono_manager.c20
-rw-r--r--telephony-binding/gdbus/ofono_manager.h2
-rw-r--r--telephony-binding/gdbus/ofono_voicecall.c11
-rw-r--r--telephony-binding/gdbus/ofono_voicecall.h3
-rw-r--r--telephony-binding/gdbus/ofono_voicecallmanager.c22
-rw-r--r--telephony-binding/gdbus/ofono_voicecallmanager.h3
6 files changed, 25 insertions, 36 deletions
diff --git a/telephony-binding/gdbus/ofono_manager.c b/telephony-binding/gdbus/ofono_manager.c
index bb99a43..49a2452 100644
--- a/telephony-binding/gdbus/ofono_manager.c
+++ b/telephony-binding/gdbus/ofono_manager.c
@@ -18,6 +18,7 @@
#include <string.h>
+#define AFB_BINDING_VERSION 2
#include <afb/afb-binding.h>
#include "ofono_manager.h"
@@ -34,9 +35,8 @@ struct ofono_manager_modem
static OrgOfonoManager *manager;
static struct ofono_manager_modem default_modem;
-static const struct afb_binding_interface *interface;
-int ofono_manager_init(const struct afb_binding_interface *iface)
+int ofono_manager_init()
{
GVariant *out_arg = NULL, *next, *value;
GError *error = NULL;
@@ -44,10 +44,8 @@ int ofono_manager_init(const struct afb_binding_interface *iface)
GVariantIter *iter, *iter2 = NULL;
int ret = 0;
- interface = iface;
-
if (manager) {
- ERROR(interface, "Ofono Manager already initialized\n");
+ AFB_ERROR("Ofono Manager already initialized\n");
return -1;
}
@@ -56,7 +54,7 @@ int ofono_manager_init(const struct afb_binding_interface *iface)
"org.ofono", "/", NULL, NULL);
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
return -1;
}
@@ -91,7 +89,7 @@ int ofono_manager_init(const struct afb_binding_interface *iface)
const gchar *ofono_manager_get_default_modem_path(void)
{
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
}
return default_modem.path;
@@ -100,7 +98,7 @@ const gchar *ofono_manager_get_default_modem_path(void)
const gchar *ofono_manager_get_default_modem_name(void)
{
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
}
return default_modem.name;
@@ -109,7 +107,7 @@ const gchar *ofono_manager_get_default_modem_name(void)
const gchar *ofono_manager_get_default_modem_type(void)
{
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
}
return default_modem.type;
@@ -118,7 +116,7 @@ const gchar *ofono_manager_get_default_modem_type(void)
gboolean ofono_manager_get_default_modem_powered(void)
{
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
}
return default_modem.powered;
@@ -127,7 +125,7 @@ gboolean ofono_manager_get_default_modem_powered(void)
gboolean ofono_manager_get_default_modem_online(void)
{
if (!manager) {
- ERROR(interface, "Ofono Manager not initialized\n");
+ AFB_ERROR("Ofono Manager not initialized\n");
}
return default_modem.online;
diff --git a/telephony-binding/gdbus/ofono_manager.h b/telephony-binding/gdbus/ofono_manager.h
index 6454246..9df9b3c 100644
--- a/telephony-binding/gdbus/ofono_manager.h
+++ b/telephony-binding/gdbus/ofono_manager.h
@@ -20,7 +20,7 @@
#include <afb/afb-binding.h>
#include <afb/afb-service-itf.h>
-int ofono_manager_init(const struct afb_binding_interface *iface);
+int ofono_manager_init(void);
const gchar *ofono_manager_get_default_modem_path(void);
const gchar *ofono_manager_get_default_modem_name(void);
const gchar *ofono_manager_get_default_modem_type(void);
diff --git a/telephony-binding/gdbus/ofono_voicecall.c b/telephony-binding/gdbus/ofono_voicecall.c
index 585bf5f..cdc0da9 100644
--- a/telephony-binding/gdbus/ofono_voicecall.c
+++ b/telephony-binding/gdbus/ofono_voicecall.c
@@ -19,12 +19,11 @@
#include <string.h>
#include <unistd.h>
+#define AFB_BINDING_VERSION 2
#include <afb/afb-binding.h>
#include "ofono_voicecall_interface.h"
-const struct afb_binding_interface *interface;
-
static void property_changed(OrgOfonoVoiceCall *voice_call,
gchar *property,
GVariant *value)
@@ -39,13 +38,11 @@ static void property_changed(OrgOfonoVoiceCall *voice_call,
}
}
-OrgOfonoVoiceCall *ofono_voicecall_new(const struct afb_binding_interface *iface,
- gchar *op,
+OrgOfonoVoiceCall *ofono_voicecall_new(gchar *op,
void (*call_state_changed)(OrgOfonoVoiceCall *,gchar *))
{
OrgOfonoVoiceCall *voice_call;
- interface = iface;
voice_call = org_ofono_voice_call_proxy_new_for_bus_sync(
G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
"org.ofono", op, NULL, NULL);
@@ -63,11 +60,11 @@ OrgOfonoVoiceCall *ofono_voicecall_new(const struct afb_binding_interface *iface
G_TYPE_STRING);
if (g_signal_connect(G_OBJECT(voice_call), "call-state-changed", G_CALLBACK(call_state_changed), NULL) <= 0) {
- ERROR(interface, "Failed to connect to signal call-state-changed\n");
+ AFB_ERROR("Failed to connect to signal call-state-changed\n");
}
if (g_signal_connect(voice_call, "property-changed", G_CALLBACK(property_changed), NULL) <= 0) {
- ERROR(interface, "Failed to connect to signal call-added\n");
+ AFB_ERROR("Failed to connect to signal call-added\n");
}
}
diff --git a/telephony-binding/gdbus/ofono_voicecall.h b/telephony-binding/gdbus/ofono_voicecall.h
index 0c2e749..dd3ff6d 100644
--- a/telephony-binding/gdbus/ofono_voicecall.h
+++ b/telephony-binding/gdbus/ofono_voicecall.h
@@ -19,8 +19,7 @@
#include "ofono_voicecall_interface.h"
OrgOfonoVoiceCall *
-ofono_voicecall_new(const struct afb_binding_interface *,
- gchar *,
+ofono_voicecall_new(gchar *,
void (*)(OrgOfonoVoiceCall *,gchar *));
void ofono_voicecall_free(OrgOfonoVoiceCall *);
void ofono_voicecall_answer(OrgOfonoVoiceCall *);
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;
}
diff --git a/telephony-binding/gdbus/ofono_voicecallmanager.h b/telephony-binding/gdbus/ofono_voicecallmanager.h
index 19ec509..7477e7c 100644
--- a/telephony-binding/gdbus/ofono_voicecallmanager.h
+++ b/telephony-binding/gdbus/ofono_voicecallmanager.h
@@ -19,8 +19,7 @@
#include "ofono_voicecallmanager_interface.h"
OrgOfonoVoiceCallManager
-*ofono_voicecallmanager_init(const struct afb_binding_interface *,
- const gchar *,
+*ofono_voicecallmanager_init(const gchar *,
void(*)(OrgOfonoVoiceCallManager *, gchar *, gchar *),
void(*)(OrgOfonoVoiceCallManager *, gchar *, gchar *),
void(*)(OrgOfonoVoiceCallManager *, gchar *));