Changeset 5f40da7 for protocols/nogaim.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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 oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• protocols/nogaim.c (modified) (2 diffs)

protocols/nogaim.c

@@ -327 +327 @@
         imcb_log( ic, "Signing off.." );
         
+        /* TBH I don't remember anymore why I didn't just use ic->acc... */
+        for( a = bee->accounts; a; a = a->next )
+                if( a->ic == ic )
+                        break;
+        
+        if( a && !allow_reconnect && !( ic->flags & OPT_LOGGED_IN ) &&
+            set_getbool( &a->set, "oauth" ) )
+        {
+                /* If this account supports OAuth, we're not logged in yet and
+                   not allowed to retry, assume there were auth issues. Give a
+                   helpful message on what might be necessary to fix this. */
+                imcb_log( ic, "If you're having problems logging in, try re-requesting "
+                          "an OAuth token: account %s set password \"\"", a->tag );
+        }
+        
         for( l = bee->users; l; )
         {
@@ -347 +362 @@
         
         query_del_by_conn( (irc_t*) ic->bee->ui_data, ic );
-        
-        for( a = bee->accounts; a; a = a->next )
-                if( a->ic == ic )
-                        break;
         
         if( !a )