Changeset aef4828 for protocols/jabber/sasl.c

Timestamp:

2007-04-06T05:20:31Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

552e641

Parents:

0da65d5

Message:

More cleanups, mainly in the callbacks. Replaced things like
do_error_dialog() and (set|hide)_login_progress(_error)?() with things
that hopefully make more sense.

Although it's still not really great...

File:

• protocols/jabber/sasl.c (modified) (6 diffs)

protocols/jabber/sasl.c

@@ -38 +38 @@
                    IQ authentication. Strange things happen when you try
                    to do both... */
-                serv_got_crap( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
+                imc_log( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
                 return XT_HANDLED;
         }
@@ -45 +45 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                signoff( ic );
+                imc_logout( ic );
                 return XT_ABORT;
         }
@@ -62 +62 @@
         if( !sup_plain && !sup_digest )
         {
-                hide_login_progress( ic, "No known SASL authentication schemes supported" );
-                signoff( ic );
+                imc_error( ic, "No known SASL authentication schemes supported" );
+                imc_logout( ic );
                 return XT_ABORT;
         }
@@ -279 +279 @@
 
 error:
-        hide_login_progress( ic, "Incorrect SASL challenge received" );
-        signoff( ic );
+        imc_error( ic, "Incorrect SASL challenge received" );
+        imc_logout( ic );
 
 silent_error:
@@ -303 +303 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                signoff( ic );
+                imc_logout( ic );
                 return XT_ABORT;
         }
@@ -309 +309 @@
         if( strcmp( node->name, "success" ) == 0 )
         {
-                set_login_progress( ic, 1, "Authentication finished" );
+                imc_log( ic, "Authentication finished" );
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
         }
         else if( strcmp( node->name, "failure" ) == 0 )
         {
-                hide_login_progress( ic, "Authentication failure" );
-                signoff( ic );
+                imc_error( ic, "Authentication failure" );
+                imc_logout( ic );
                 return XT_ABORT;
         }