summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-09 20:14:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:15 -0500
commitf600f1c68e1de3f755e929b045d08a656d57b6ce (patch)
tree5dd9bae4e18209ef58c0cd671619bbfcd404e626 /source4
parentcdfdb732805da3dad447583e0a1f9abea11ba1a2 (diff)
downloadsamba-f600f1c68e1de3f755e929b045d08a656d57b6ce.tar.gz
samba-f600f1c68e1de3f755e929b045d08a656d57b6ce.tar.bz2
samba-f600f1c68e1de3f755e929b045d08a656d57b6ce.zip
r12151: match the select mode of the standard events system and the liboop system,
and report errors as read events metze (This used to be commit 5bbd54e96c75af765f827238d6c80101613ae64f)
Diffstat (limited to 'source4')
-rw-r--r--source4/gtk/common/gtk_events.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/gtk/common/gtk_events.c b/source4/gtk/common/gtk_events.c
index 7f1230b13f..9a0af5fdeb 100644
--- a/source4/gtk/common/gtk_events.c
+++ b/source4/gtk/common/gtk_events.c
@@ -145,7 +145,7 @@ static struct fd_event *gtk_event_add_fd(struct event_context *ev, TALLOC_CTX *m
}
if (fde->flags & EVENT_FD_READ)
- condition |= G_IO_IN;
+ condition |= (G_IO_IN | G_IO_ERR | G_IO_HUP);
if (fde->flags & EVENT_FD_WRITE)
condition |= G_IO_OUT;
@@ -187,7 +187,7 @@ static void gtk_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
if (fde->flags == flags) return;
if (flags & EVENT_FD_READ)
- condition |= G_IO_IN;
+ condition |= (G_IO_IN | G_IO_ERR | G_IO_HUP);
if (flags & EVENT_FD_WRITE)
condition |= G_IO_OUT;