diff options
author | fourdan | 2007-01-29 10:09:59 +0000 |
---|---|---|
committer | fourdan | 2007-01-29 10:09:59 +0000 |
commit | 68e3c0ed570ba3e994f8a1c4b20594372fb0b514 (patch) | |
tree | 8d6c0d6876340742ea6f49dc9faa40aef9855563 /src/ivyglibloop.c | |
parent | 6fc08ea508e4fa39a9bf7f5495e84a68bd0bf88a (diff) | |
parent | f70181ffe0b37952384ff5e0ce0185541828014f (diff) | |
download | ivy-c-68e3c0ed570ba3e994f8a1c4b20594372fb0b514.zip ivy-c-68e3c0ed570ba3e994f8a1c4b20594372fb0b514.tar.gz ivy-c-68e3c0ed570ba3e994f8a1c4b20594372fb0b514.tar.bz2 ivy-c-68e3c0ed570ba3e994f8a1c4b20594372fb0b514.tar.xz |
Rename protocol_v3 as trunk to avoid confusion on protocol version to use.
Diffstat (limited to 'src/ivyglibloop.c')
-rw-r--r-- | src/ivyglibloop.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/ivyglibloop.c b/src/ivyglibloop.c index e1944dd..c4976b1 100644 --- a/src/ivyglibloop.c +++ b/src/ivyglibloop.c @@ -26,7 +26,8 @@ #endif #include <glib.h> - +#include "ivydebug.h" +#include "ivychannel.h" #include "ivyglibloop.h" struct _channel { @@ -58,13 +59,9 @@ void IvyChannelInit(void) { channel_initialized = 1; } -void IvyChannelStop( ) -{ - channel_initialized = 0; -} -Channel IvyChannelAdd(IVY_HANDLE fd, void *data, +Channel IvyChannelAdd(HANDLE fd, void *data, ChannelHandleDelete handle_delete, ChannelHandleRead handle_read ) { @@ -95,14 +92,13 @@ void IvyChannelRemove( Channel channel ) { g_source_remove( channel->id_read ); g_source_remove( channel->id_delete ); } + static gboolean IvyGlibHandleChannelRead(GIOChannel *source, GIOCondition condition, gpointer data) { Channel channel = (Channel)data; -#ifdef DEBUG - printf("Handle Channel read %d\n",source ); -#endif + TRACE("Handle Channel read %d\n",source ); (*channel->handle_read)(channel, g_io_channel_unix_get_fd(source), channel->data); return TRUE; } @@ -111,15 +107,15 @@ static gboolean IvyGlibHandleChannelDelete(GIOChannel *source, GIOCondition condition, gpointer data) { Channel channel = (Channel)data; -#ifdef DEBUG - printf("Handle Channel delete %d\n",source ); -#endif + TRACE("Handle Channel delete %d\n",source ); (*channel->handle_delete)(channel->data); return TRUE; } -void IvyMainLoop(void(*hook)(void)) + +void +IvyChannelStop () { - GMainLoop *ml = g_main_loop_new(NULL, FALSE); - g_main_loop_run(ml); + /* To be implemented */ } + |