Changeset 4aa0f6b for lib/events_libevent.c

Timestamp:

2010-06-07T14:31:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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 killerbee stuff, bringing all the bleeding-edge stuff together.

File:

• lib/events_libevent.c (modified) (6 diffs)

lib/events_libevent.c

@@ -60 +60 @@
         b_event_handler function;
         void *data;
+        guint flags;
 };
 
@@ -126 +127 @@
         {
                 if( event & EV_READ )
-                        cond |= GAIM_INPUT_READ;
+                        cond |= B_EV_IO_READ;
                 if( event & EV_WRITE )
-                        cond |= GAIM_INPUT_WRITE;
+                        cond |= B_EV_IO_WRITE;
         }
         
@@ -150 +151 @@
                 return;
         }
-        else if( !st )
+        else if( !st && !( b_ev->flags & B_EV_FLAG_FORCE_REPEAT ) )
         {
                 event_debug( "Handler returned FALSE: " );
@@ -174 +175 @@
         event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) ", fd, condition, function, data );
         
-        if( ( condition & GAIM_INPUT_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
-            ( condition & GAIM_INPUT_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
+        if( ( condition & B_EV_IO_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
+            ( condition & B_EV_IO_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
         {
                 /* We'll stick with this libevent entry, but give it a new BitlBee id. */
@@ -198 +199 @@
                 
                 out_cond = EV_PERSIST;
-                if( condition & GAIM_INPUT_READ )
+                if( condition & B_EV_IO_READ )
                         out_cond |= EV_READ;
-                if( condition & GAIM_INPUT_WRITE )
+                if( condition & B_EV_IO_WRITE )
                         out_cond |= EV_WRITE;
                 
@@ -212 +213 @@
         }
         
+        b_ev->flags = condition;
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
         return b_ev->id;