Changeset 84b045d for protocols/jabber/io.c

Timestamp:

2007-04-16T01:03:08Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bbb939

Parents:

c2fb3809

Message:

s/imc/imcb/ for callback functions. Moved things aroundin nogaim.h a
little bit, grouping things by category instead of original Gaim 0.58
filename.

File:

• protocols/jabber/io.c (modified) (12 diffs)

protocols/jabber/io.c

@@ -117 +117 @@
                 jd->fd = -1;
                 
-                imc_error( ic, "Short write() to server" );
+                imcb_error( ic, "Short write() to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
@@ -160 +160 @@
                 if( xt_feed( jd->xt, buf, st ) < 0 )
                 {
-                        imc_error( ic, "XML stream error" );
+                        imcb_error( ic, "XML stream error" );
                         imc_logout( ic, TRUE );
                         return FALSE;
@@ -203 +203 @@
                                         if( set_getbool( &ic->acc->set, "tls" ) )
                                         {
-                                                imc_error( ic, "TLS is turned on for this "
+                                                imcb_error( ic, "TLS is turned on for this "
                                                           "account, but is not supported by this server" );
                                                 imc_logout( ic, FALSE );
@@ -216 +216 @@
                         else
                         {
-                                imc_error( ic, "XML stream error" );
+                                imcb_error( ic, "XML stream error" );
                                 imc_logout( ic, TRUE );
                                 return FALSE;
@@ -227 +227 @@
                 jd->fd = -1;
                 
-                imc_error( ic, "Error while reading from server" );
+                imcb_error( ic, "Error while reading from server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
@@ -242 +242 @@
         if( source == -1 )
         {
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
         }
         
-        imc_log( ic, "Connected to server, logging in" );
+        imcb_log( ic, "Connected to server, logging in" );
         
         return jabber_start_stream( ic );
@@ -263 +263 @@
                 jd->ssl = NULL;
                 
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
         }
         
-        imc_log( ic, "Connected to server, logging in" );
+        imcb_log( ic, "Connected to server, logging in" );
         
         return jabber_start_stream( ic );
@@ -297 +297 @@
                 if( c && ( !trytls && !set_getbool( &ic->acc->set, "tls" ) ) )
                 {
-                        imc_error( ic, "Server requires TLS connections, but TLS is turned off for this account" );
+                        imcb_error( ic, "Server requires TLS connections, but TLS is turned off for this account" );
                         imc_logout( ic, FALSE );
                         
@@ -327 +327 @@
                 if( !trytls && set_getbool( &ic->acc->set, "tls" ) )
                 {
-                        imc_error( ic, "TLS is turned on for this account, but is not supported by this server" );
+                        imcb_error( ic, "TLS is turned on for this account, but is not supported by this server" );
                         imc_logout( ic, FALSE );
                         
@@ -417 +417 @@
         jd->w_inpa = jd->r_inpa = 0;
         
-        imc_log( ic, "Converting stream to TLS" );
+        imcb_log( ic, "Converting stream to TLS" );
         
         jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
@@ -453 +453 @@
         if( type == NULL )
         {
-                imc_error( ic, "Unknown stream error reported by server" );
+                imcb_error( ic, "Unknown stream error reported by server" );
                 imc_logout( ic, allow_reconnect );
                 return XT_ABORT;
@@ -463 +463 @@
         if( strcmp( type, "conflict" ) == 0 )
         {
-                imc_error( ic, "Account and resource used from a different location" );
+                imcb_error( ic, "Account and resource used from a different location" );
                 allow_reconnect = FALSE;
         }
         else
         {
-                imc_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
+                imcb_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
         }