summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
Diffstat (limited to 'input')
-rw-r--r--input/device.c12
-rw-r--r--input/server.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/input/device.c b/input/device.c
index 4ab7aabc..3c050187 100644
--- a/input/device.c
+++ b/input/device.c
@@ -354,7 +354,7 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
*/
fake->uinput = uinput_create(idev->name);
if (fake->uinput < 0) {
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
reply = connection_attempt_failed(iconn->pending_connect,
strerror(errno));
goto failed;
@@ -405,7 +405,7 @@ static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, gpointer data
gboolean connected = FALSE;
if (cond & (G_IO_HUP | G_IO_ERR))
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
emit_property_changed(idev->conn, idev->path, INPUT_DEVICE_INTERFACE,
"Connected", DBUS_TYPE_BOOLEAN, &connected);
@@ -429,7 +429,7 @@ static gboolean ctrl_watch_cb(GIOChannel *chan, GIOCondition cond, gpointer data
struct input_conn *iconn = data;
if (cond & (G_IO_HUP | G_IO_ERR))
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
g_source_remove(iconn->intr_watch);
iconn->intr_watch = 0;
@@ -687,7 +687,7 @@ static void interrupt_connect_cb(GIOChannel *chan, GError *conn_err,
err = hidp_add_connection(idev, iconn);
if (err < 0) {
err_msg = strerror(-err);
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
goto failed;
}
@@ -742,7 +742,7 @@ static void control_connect_cb(GIOChannel *chan, GError *conn_err,
reply = connection_attempt_failed(iconn->pending_connect,
err->message);
g_error_free(err);
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
goto failed;
}
@@ -766,7 +766,7 @@ static int fake_disconnect(struct input_conn *iconn)
if (!fake->io)
return -ENOTCONN;
- g_io_channel_close(fake->io);
+ g_io_channel_shutdown(fake->io, TRUE, NULL);
g_io_channel_unref(fake->io);
fake->io = NULL;
diff --git a/input/server.c b/input/server.c
index 88db485c..9cb958df 100644
--- a/input/server.c
+++ b/input/server.c
@@ -106,7 +106,7 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data)
if (gerr) {
error("%s", gerr->message);
g_error_free(gerr);
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
return;
}
@@ -121,7 +121,7 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data)
int err;
err = write(sk, unplug, sizeof(unplug));
}
- g_io_channel_close(chan);
+ g_io_channel_shutdown(chan, TRUE, NULL);
return;
}
@@ -179,10 +179,10 @@ void server_stop(const bdaddr_t *src)
server = l->data;
- g_io_channel_close(server->intr);
+ g_io_channel_shutdown(server->intr, TRUE, NULL);
g_io_channel_unref(server->intr);
- g_io_channel_close(server->ctrl);
+ g_io_channel_shutdown(server->ctrl, TRUE, NULL);
g_io_channel_unref(server->ctrl);
servers = g_slist_remove(servers, server);