From 6b1e2b8fed754ca62d73dbe8bcc56e55396b8a86 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 23 Mar 1999 21:44:16 +0000 Subject: [PATCH] Add user_data to check and prepare functions -Yosh --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ giounix.c | 12 ++++++++---- glib/giounix.c | 12 ++++++++---- 10 files changed, 48 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a531def3..79e84d4a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1a531def3..79e84d4a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Tue Mar 23 13:43:39 PST 1999 Manish Singh + + * giounix.c: add user_data param to check and prepare functions + Mon Mar 22 03:54:43 1999 Tim Janik * glib.h: diff --git a/giounix.c b/giounix.c index 4944d8f09..108527516 100644 --- a/giounix.c +++ b/giounix.c @@ -78,9 +78,11 @@ static guint g_io_unix_add_watch (GIOChannel *channel, GDestroyNotify notify); static gboolean g_io_unix_prepare (gpointer source_data, GTimeVal *current_time, - gint *timeout); + gint *timeout, + gpointer user_data); static gboolean g_io_unix_check (gpointer source_data, - GTimeVal *current_time); + GTimeVal *current_time, + gpointer user_data); static gboolean g_io_unix_dispatch (gpointer source_data, GTimeVal *current_time, gpointer user_data); @@ -105,7 +107,8 @@ GIOFuncs unix_channel_funcs = { static gboolean g_io_unix_prepare (gpointer source_data, GTimeVal *current_time, - gint *timeout) + gint *timeout, + gpointer user_data) { *timeout = -1; return FALSE; @@ -113,7 +116,8 @@ g_io_unix_prepare (gpointer source_data, static gboolean g_io_unix_check (gpointer source_data, - GTimeVal *current_time) + GTimeVal *current_time, + gpointer user_data) { GIOUnixWatch *data = source_data; diff --git a/glib/giounix.c b/glib/giounix.c index 4944d8f09..108527516 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -78,9 +78,11 @@ static guint g_io_unix_add_watch (GIOChannel *channel, GDestroyNotify notify); static gboolean g_io_unix_prepare (gpointer source_data, GTimeVal *current_time, - gint *timeout); + gint *timeout, + gpointer user_data); static gboolean g_io_unix_check (gpointer source_data, - GTimeVal *current_time); + GTimeVal *current_time, + gpointer user_data); static gboolean g_io_unix_dispatch (gpointer source_data, GTimeVal *current_time, gpointer user_data); @@ -105,7 +107,8 @@ GIOFuncs unix_channel_funcs = { static gboolean g_io_unix_prepare (gpointer source_data, GTimeVal *current_time, - gint *timeout) + gint *timeout, + gpointer user_data) { *timeout = -1; return FALSE; @@ -113,7 +116,8 @@ g_io_unix_prepare (gpointer source_data, static gboolean g_io_unix_check (gpointer source_data, - GTimeVal *current_time) + GTimeVal *current_time, + gpointer user_data) { GIOUnixWatch *data = source_data;