Changeset b5c8a34

Timestamp:

2008-01-24T22:49:47Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

764c7d1, f774e01

Parents:

613cc55

Message:

Keeping track of valid Jabber connections so _connected() events will be
ignored if the connection's dead already. Necessary if using GLib for event
handling for now. :-/

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• jabber.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/io.c

@@ -249 +249 @@
         struct im_connection *ic = data;
         
+        if( g_slist_find( jabber_connections, ic ) == NULL )
+                return FALSE;
+        
         if( source == -1 )
         {
@@ -264 +267 @@
 {
         struct im_connection *ic = data;
-        struct jabber_data *jd = ic->proto_data;
+        struct jabber_data *jd;
+        
+        if( g_slist_find( jabber_connections, ic ) == NULL )
+                return FALSE;
+        
+        jd = ic->proto_data;
         
         if( source == NULL )

protocols/jabber/jabber.c

@@ -35 +35 @@
 #include "base64.h"
 
+GSList *jabber_connections;
+
 static void jabber_init( account_t *acc )
 {
@@ -70 +72 @@
         struct ns_srv_reply *srv = NULL;
         char *connect_to, *s;
+        
+        /* For now this is needed in the _connected() handlers if using
+           GLib event handling, to make sure we're not handling events
+           on dead connections. */
+        jabber_connections = g_slist_prepend( jabber_connections, ic );
         
         jd->ic = ic;
@@ -263 +270 @@
         g_free( jd->username );
         g_free( jd );
+        
+        jabber_connections = g_slist_remove( jabber_connections, ic );
 }
 

protocols/jabber/jabber.h

@@ -29 +29 @@
 #include "xmltree.h"
 #include "bitlbee.h"
+
+extern GSList *jabber_connections;
 
 typedef enum