diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-06-07 19:30:24 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-06-07 19:30:24 +0000 |
| commit | f80a7215275b229a597cf8d2bbc7e4e208af522c (patch) | |
| tree | 9b9fcfd87de495562932e219dfb9db64859a8140 /serial | |
| parent | 15eded276cb81a91f812fe8a5eb8e29a3839542b (diff) | |
| download | bluez-f80a7215275b229a597cf8d2bbc7e4e208af522c.tar.gz | |
Use g_dbus_emit_signal for sending D-Bus signals
Diffstat (limited to 'serial')
| -rw-r--r-- | serial/manager.c | 12 | ||||
| -rw-r--r-- | serial/port.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/serial/manager.c b/serial/manager.c index d285eeda0..cad09e7ec 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -239,7 +239,7 @@ static void open_notify(int fd, int err, struct pending_connect *pc) dbus_message_unref(reply); /* Send the D-Bus signal */ - dbus_connection_emit_signal(pc->conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(pc->conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ServiceConnected" , DBUS_TYPE_STRING, &pc->dev, DBUS_TYPE_INVALID); @@ -458,7 +458,7 @@ static DBusMessage *create_channel_port(DBusConnection *conn, dbus_connection_send(conn, reply, NULL); dbus_message_unref(reply); - dbus_connection_emit_signal(conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "PortCreated" , DBUS_TYPE_STRING, &ppath, DBUS_TYPE_INVALID); @@ -757,7 +757,7 @@ static DBusMessage *remove_port(DBusConnection *conn, if (port_unregister(path) < 0) return does_not_exist(msg, "Invalid RFCOMM node"); - dbus_connection_emit_signal(conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "PortRemoved" , DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); @@ -1544,7 +1544,7 @@ static DBusMessage *create_proxy(DBusConnection *conn, return failed(msg, "Create object path failed"); } - dbus_connection_emit_signal(connection, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(connection, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ProxyCreated", DBUS_TYPE_STRING, &ppath, DBUS_TYPE_INVALID); @@ -1599,7 +1599,7 @@ static DBusMessage *remove_proxy(DBusConnection *conn, if (!l) return does_not_exist(msg, "Invalid proxy path"); - dbus_connection_emit_signal(conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ProxyRemoved", DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); @@ -1714,7 +1714,7 @@ static DBusMessage *disconnect_service(DBusConnection *conn, if (err < 0) return does_not_exist(msg, "Invalid RFCOMM node"); - dbus_connection_emit_signal(conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ServiceDisconnected" , DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); diff --git a/serial/port.c b/serial/port.c index c722dde4c..522f7c016 100644 --- a/serial/port.c +++ b/serial/port.c @@ -253,7 +253,7 @@ static void connection_owner_exited(void *user_data) debug("Connect requestor exited. Releasing %s node", node->device); - dbus_connection_emit_signal(node->conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(node->conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ServiceDisconnected" , DBUS_TYPE_STRING, &node->device, DBUS_TYPE_INVALID); @@ -269,7 +269,7 @@ static gboolean rfcomm_disconnect_cb(GIOChannel *io, g_dbus_remove_watch(node->conn, node->listener_id); - dbus_connection_emit_signal(node->conn, SERIAL_MANAGER_PATH, + g_dbus_emit_signal(node->conn, SERIAL_MANAGER_PATH, SERIAL_MANAGER_INTERFACE, "ServiceDisconnected" , DBUS_TYPE_STRING, &node->device, DBUS_TYPE_INVALID); |