summaryrefslogtreecommitdiff
path: root/src/ivyglibloop.c
diff options
context:
space:
mode:
authorfcolin2006-04-21 16:34:15 +0000
committerfcolin2006-04-21 16:34:15 +0000
commit1e48ff652b95379376044b0a7187e1c75fb76d42 (patch)
tree76a44c23f28ee1b229b1ebf4347ad4c53dacb196 /src/ivyglibloop.c
parentf00381a5ab15d162f02f699304a437346d637a12 (diff)
downloadivy-c-1e48ff652b95379376044b0a7187e1c75fb76d42.zip
ivy-c-1e48ff652b95379376044b0a7187e1c75fb76d42.tar.gz
ivy-c-1e48ff652b95379376044b0a7187e1c75fb76d42.tar.bz2
ivy-c-1e48ff652b95379376044b0a7187e1c75fb76d42.tar.xz
cleanup sur channel et main loop
Diffstat (limited to 'src/ivyglibloop.c')
-rw-r--r--src/ivyglibloop.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ivyglibloop.c b/src/ivyglibloop.c
index aea3c54..c4976b1 100644
--- a/src/ivyglibloop.c
+++ b/src/ivyglibloop.c
@@ -27,6 +27,7 @@
#include <glib.h>
#include "ivydebug.h"
+#include "ivychannel.h"
#include "ivyglibloop.h"
struct _channel {
@@ -39,9 +40,6 @@ struct _channel {
static int channel_initialized = 0;
-ChannelInit channel_init = IvyGlibChannelInit;
-ChannelSetUp channel_setup = IvyGlibChannelSetUp;
-ChannelClose channel_close = IvyGlibChannelClose;
static gboolean IvyGlibHandleChannelRead(GIOChannel *source,
GIOCondition condition,
@@ -52,7 +50,7 @@ static gboolean IvyGlibHandleChannelDelete(GIOChannel *source,
gpointer data);
-void IvyGlibChannelInit(void) {
+void IvyChannelInit(void) {
if ( channel_initialized ) return;
/* fixes bug when another app coredumps */
#ifndef WIN32
@@ -63,7 +61,7 @@ void IvyGlibChannelInit(void) {
-Channel IvyGlibChannelSetUp(HANDLE fd, void *data,
+Channel IvyChannelAdd(HANDLE fd, void *data,
ChannelHandleDelete handle_delete,
ChannelHandleRead handle_read
) {
@@ -88,7 +86,7 @@ Channel IvyGlibChannelSetUp(HANDLE fd, void *data,
-void IvyGlibChannelClose( Channel channel ) {
+void IvyChannelRemove( Channel channel ) {
if ( channel->handle_delete )
(*channel->handle_delete)( channel->data );
g_source_remove( channel->id_read );
@@ -116,7 +114,7 @@ static gboolean IvyGlibHandleChannelDelete(GIOChannel *source,
void
-IvyStop ()
+IvyChannelStop ()
{
/* To be implemented */
}