Changeset a0d04d6 for ipc.c

Timestamp:

2006-05-07T18:07:43Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ecf8fa8

Parents:

64d1f45

Message:

Got rid of all GLib GIOChannel-related calls outside proxy.c

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -463 +463 @@
 
 
-static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
+static void new_ipc_client( gpointer data, gint serversock, GaimInputCondition cond )
 {
         struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
-        int serversock;
-
-        serversock = g_io_channel_unix_get_fd(gio);
-
-        child->ipc_fd = accept(serversock, NULL, 0);
-
-        if (child->ipc_fd == -1) {
+        
+        child->ipc_fd = accept( serversock, NULL, 0 );
+        
+        if( child->ipc_fd == -1 )
+        {
                 log_message( LOGLVL_WARNING, "Unable to accept connection on UNIX domain socket: %s", strerror(errno) );
-                return TRUE;
+                return;
         }
                 
         child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
-                
+        
         child_list = g_slist_append( child_list, child );
-
-        return TRUE;
 }
 
@@ -489 +485 @@
         struct sockaddr_un un_addr;
         int serversock;
-        GIOChannel *gio;
 
         /* Clean up old socket files that were hanging around.. */
@@ -517 +512 @@
         }
         
-        gio = g_io_channel_unix_new(serversock);
-        
-        if (gio == NULL) {
-                log_message( LOGLVL_WARNING, "Unable to create IO channel for unix socket" );
-                return 0;
-        }
-
-        g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
+        gaim_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        
         return 1;
 }