Changeset 09f8cd1

Timestamp:

2006-05-12T18:31:44Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b642f381

Parents:

13cc96c

Message:

Stable, almost finished.

File:

• protocols/events_libevent.c (modified) (7 diffs)

protocols/events_libevent.c

@@ -39 +39 @@
 static GHashTable *id_hash;
 
-
 struct b_event_data
 {
@@ -73 +72 @@
         struct b_event_data *b_ev = data;
         b_input_condition cond = 0;
-
-        if( event & EV_READ )
-                cond |= GAIM_INPUT_READ;
-        if( event & EV_WRITE )
-                cond |= GAIM_INPUT_WRITE;
-
+        
+        if( fd >= 0 )
+        {
+                if( event & EV_READ )
+                        cond |= GAIM_INPUT_READ;
+                if( event & EV_WRITE )
+                        cond |= GAIM_INPUT_WRITE;
+        }
+        
         if( !b_ev->function( b_ev->data, fd, cond ) )
                 b_event_remove( b_ev->id );
@@ -88 +90 @@
         GIOCondition cond;
         
-        b_ev->id == id_next++;
+        b_ev->id = id_next++;
         b_ev->function = function;
         b_ev->data = data;
@@ -106 +108 @@
 }
 
+/* TODO: Persistence for timers! */
 gint b_timeout_add( gint timeout, b_event_handler function, gpointer data )
 {
@@ -111 +114 @@
         struct timeval tv;
         
-        b_ev->id == id_next++;
+        b_ev->id = id_next++;
         b_ev->function = function;
         b_ev->data = data;
@@ -119 +122 @@
         
         evtimer_set( &b_ev->evinfo, b_event_passthrough, b_ev );
-        evtimer_add( &b_ev->evinfo, &tv);
+        evtimer_add( &b_ev->evinfo, &tv );
         
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
@@ -133 +136 @@
         {
                 event_del( &b_ev->evinfo );
-                g_hash_table_remove( id_hash, &tag );
+                g_hash_table_remove( id_hash, &b_ev->id );
                 g_free( b_ev );
         }