diff options
| author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 15:58:15 -0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 16:23:10 -0300 |
| commit | 10d6858927cb3db0a06c42f41cdb5f3175082df3 (patch) | |
| tree | 84b4164449b747d56c0d4b86b205f80744162fc5 /network | |
| parent | e777c55aa7cd84fe63bcdee16acde8d1a293b928 (diff) | |
Make use of g_io_channel_shutdown instead of deprecated g_io_channel_close.
Diffstat (limited to 'network')
| -rw-r--r-- | network/connection.c | 6 | ||||
| -rw-r--r-- | network/server.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/network/connection.c b/network/connection.c index fd91bd27..bc693aba 100644 --- a/network/connection.c +++ b/network/connection.c @@ -170,7 +170,7 @@ static gboolean bnep_watchdog_cb(GIOChannel *chan, GIOCondition cond, nc->state = DISCONNECTED; memset(nc->dev, 0, 16); strncpy(nc->dev, prefix, strlen(prefix)); - g_io_channel_close(chan); + g_io_channel_shutdown(chan, TRUE, NULL); return FALSE; } @@ -275,7 +275,7 @@ failed: nc->state = DISCONNECTED; reply = connection_attempt_failed(nc->msg, strerror(EIO)); g_dbus_send_message(connection, reply); - g_io_channel_close(chan); + g_io_channel_shutdown(chan, TRUE, NULL); } return FALSE; @@ -339,7 +339,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer data) if (perr < 0) { err_msg = strerror(-perr); error("bnep connect(): %s (%d)", err_msg, -perr); - g_io_channel_close(chan); + g_io_channel_shutdown(chan, TRUE, NULL); g_io_channel_unref(chan); goto failed; } diff --git a/network/server.c b/network/server.c index 7e3b03a7..01ab5ed7 100644 --- a/network/server.c +++ b/network/server.c @@ -795,7 +795,7 @@ static DBusMessage *set_property(DBusConnection *conn, static void adapter_free(struct network_adapter *na) { if (na->io != NULL) { - g_io_channel_close(na->io); + g_io_channel_shutdown(na->io, TRUE, NULL); g_io_channel_unref(na->io); } |