Changes in lib/events_libevent.c [c5c18c1:939370c]

File:

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

lib/events_libevent.c

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