summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-04-04 07:30:14 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-04-04 07:30:14 +0000
commita36be2a103e95b04d5b348c83b41dc8c06439990 (patch)
treec81c054292e610b93af27a4c416fd4e5f709b5f0 /daemon
parentf89882a84a048cd676798e4a047a73fb202e246d (diff)
Fix missing G_IO_NVAL handling
Diffstat (limited to 'daemon')
-rw-r--r--daemon/echo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/echo.c b/daemon/echo.c
index 41c67559..1fe23727 100644
--- a/daemon/echo.c
+++ b/daemon/echo.c
@@ -55,7 +55,7 @@ static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data
gsize len, written;
GIOError err;
- if (cond & (G_IO_HUP | G_IO_ERR))
+ if (cond & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
return FALSE;
err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len);
@@ -104,7 +104,7 @@ static void authorization_callback(DBusPendingCall *call, void *data)
dbus_error_free(&err);
} else {
info("Accepting incoming connection");
- g_io_add_watch(auth->io, G_IO_IN | G_IO_HUP | G_IO_ERR,
+ g_io_add_watch(auth->io, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
session_event, NULL);
}