Changes in protocols/ssl_gnutls.c [2b7d2d1:a03a9f3]

File:

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

protocols/ssl_gnutls.c

@@ -48 +48 @@
 };
 
-static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond );
+static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
 
 
@@ -81 +81 @@
 }
 
-static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
-
-static gboolean ssl_connected( gpointer data, gint source, b_input_condition cond )
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+
+static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
 {
         struct scd *conn = data;
@@ -96 +96 @@
                 g_free( conn );
                 
-                return FALSE;
+                return;
         }
         
@@ -102 +102 @@
         gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) conn->fd );
         
-        return ssl_handshake( data, source, cond );
-}
-
-static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond )
+        ssl_handshake( data, source, cond );
+}
+
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
 {
         struct scd *conn = data;
         int st;
         
+        if( conn->inpa != -1 )
+        {
+                gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
+        
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
         {
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = b_input_add( conn->fd, ssl_getdirection( conn ),
-                                                  ssl_handshake, data );
+                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
+                                                     ssl_handshake, data );
                 }
                 else
@@ -136 +142 @@
                 conn->func( conn->data, conn, cond );
         }
-        
-        return FALSE;
 }
 
@@ -183 +187 @@
         
         if( conn->inpa != -1 )
-                b_event_remove( conn->inpa );
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -200 +204 @@
 }
 
-b_input_condition ssl_getdirection( void *conn )
+GaimInputCondition ssl_getdirection( void *conn )
 {
         return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?