sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

bluetooth: move find_adapter_cb to better place.

This commit is contained in:
Gustavo F. Padovan 2011-02-17 19:00:45 -03:00 committed by Marcel Holtmann
parent f7d4643cc5
commit e7f8041acd
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/bluetooth.c
View File

@ -633,6 +633,32 @@ static void add_record(gpointer data, gpointer user_data)
DBUS_TYPE_INVALID);
}
static void find_adapter_cb(DBusPendingCall *call, gpointer user_data)
{
DBusMessage *reply = dbus_pending_call_steal_reply(call);
DBusError derr;
const char *path;
dbus_error_init(&derr);
if (dbus_set_error_from_message(&derr, reply)) {
ofono_error("Replied with an error: %s, %s",
derr.name, derr.message);
dbus_error_free(&derr);
goto done;
}
dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID);
adapter_any_path = g_strdup(path);
g_slist_foreach(server_list, (GFunc) add_record, NULL);
done:
dbus_message_unref(reply);
}
static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
void *user_data)
{
@ -724,32 +750,6 @@ static void bluetooth_disconnect(DBusConnection *connection, void *user_data)
g_hash_table_foreach(uuid_hash, bluetooth_remove_all_modem, NULL);
}
static void find_adapter_cb(DBusPendingCall *call, gpointer user_data)
{
DBusMessage *reply = dbus_pending_call_steal_reply(call);
DBusError derr;
const char *path;
dbus_error_init(&derr);
if (dbus_set_error_from_message(&derr, reply)) {
ofono_error("Replied with an error: %s, %s",
derr.name, derr.message);
dbus_error_free(&derr);
goto done;
}
dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID);
adapter_any_path = g_strdup(path);
g_slist_foreach(server_list, (GFunc) add_record, NULL);
done:
dbus_message_unref(reply);
}
static guint bluetooth_watch;
static guint adapter_added_watch;
static guint adapter_removed_watch;