Changeset b308cf9 for ipc.c

Timestamp:

2010-06-05T23:21:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1fdb0a4

Parents:

3ab1d31 (diff), e774815 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -514 +514 @@
         }
                 
-        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+        child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
         
         child_list = g_slist_append( child_list, child );
@@ -552 +552 @@
         }
         
-        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        b_input_add( serversock, B_EV_IO_READ, new_ipc_client, NULL );
         
         return 1;
@@ -597 +597 @@
                         return 0;
                 }
-                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );