Changeset b72caac for protocols/msn

Timestamp:

2006-06-21T16:34:33Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

59f5c42a

Parents:

3af70b0 (diff), df417ca (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 libevent branch: Events can now be handles by both glib and libevent.

Location:

protocols/msn

Files:

• msn.h (modified) (2 diffs)
• ns.c (modified) (7 diffs)
• sb.c (modified) (7 diffs)

protocols/msn/msn.h

@@ -146 +146 @@
 
 /* ns.c */
-void msn_ns_connected( gpointer data, gint source, GaimInputCondition cond );
+gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
 
 /* msn_util.c */
@@ -173 +173 @@
 void msn_sb_to_chat( struct msn_switchboard *sb );
 void msn_sb_destroy( struct msn_switchboard *sb );
-void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond );
+gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );

protocols/msn/ns.c

@@ -30 +30 @@
 #include "md5.h"
 
-static void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond );
+static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond );
 static int msn_ns_command( gpointer data, char **cmd, int num_parts );
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
@@ -36 +36 @@
 static void msn_auth_got_passport_id( struct passport_reply *rep );
 
-void msn_ns_connected( gpointer data, gint source, GaimInputCondition cond )
+gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct gaim_connection *gc = data;
@@ -43 +43 @@
         
         if( !g_slist_find( msn_connections, gc ) )
-                return;
+                return FALSE;
         
         if( source == -1 )
@@ -49 +49 @@
                 hide_login_progress( gc, "Could not connect to server" );
                 signoff( gc );
-                return;
+                return FALSE;
         }
         
@@ -75 +75 @@
         if( msn_write( gc, s, strlen( s ) ) )
         {
-                gc->inpa = gaim_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
+                gc->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, gc );
                 set_login_progress( gc, 1, "Connected to server, waiting for reply" );
         }
+        
+        return FALSE;
 }
 
-void msn_ns_callback( gpointer data, gint source, GaimInputCondition cond )
+static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct gaim_connection *gc = data;
@@ -89 +91 @@
                 hide_login_progress( gc, "Error while reading from server" );
                 signoff( gc );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }
 
@@ -130 +136 @@
                 if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
                 {
-                        gaim_input_remove( gc->inpa );
+                        b_event_remove( gc->inpa );
                         gc->inpa = 0;
                         closesocket( md->fd );

protocols/msn/sb.c

@@ -30 +30 @@
 #include "md5.h"
 
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond );
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
 static int msn_sb_command( gpointer data, char **cmd, int num_parts );
 static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
@@ -237 +237 @@
         }
         
-        if( sb->inp ) gaim_input_remove( sb->inp );
+        if( sb->inp ) b_event_remove( sb->inp );
         closesocket( sb->fd );
         
@@ -245 +245 @@
 }
 
-void msn_sb_connected( gpointer data, gint source, GaimInputCondition cond )
+gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -254 +254 @@
         /* Are we still alive? */
         if( !g_slist_find( msn_switchboards, sb ) )
-                return;
+                return FALSE;
         
         gc = sb->gc;
@@ -263 +263 @@
                 debug( "ERROR %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
-                return;
+                return FALSE;
         }
         
@@ -280 +280 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = gaim_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
                 debug( "ERROR %d while connecting to switchboard server", 2 );
-}
-
-static void msn_sb_callback( gpointer data, gint source, GaimInputCondition cond )
+        
+        return FALSE;
+}
+
+static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct msn_switchboard *sb = data;
@@ -293 +295 @@
                 debug( "ERROR: Switchboard died" );
                 msn_sb_destroy( sb );
-        }
+                
+                return FALSE;
+        }
+        else
+                return TRUE;
 }