Changeset 601e813 for account.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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:

[merge] Wilmer

File:

• account.c (modified) (2 diffs)

account.c

@@ -53 +53 @@
 {
         account_t *a, *ret = NULL;
+        char *handle, *s;
         int nr;
+        
+        /* This checks if the id string ends with (...) */
+        if( ( handle = strchr( id, '(' ) ) && ( s = strchr( handle, ')' ) ) && s[1] == 0 )
+        {
+                struct prpl *proto;
+                
+                *s = *handle = 0;
+                handle ++;
+                
+                if( ( proto = find_protocol( id ) ) )
+                {
+                        for( a = irc->accounts; a; a = a->next )
+                                if( a->prpl == proto &&
+                                    a->prpl->cmp_buddynames( handle, a->user ) == 0 )
+                                        ret = a;
+                }
+                
+                /* Restore the string. */
+                handle --;
+                *handle = '(';
+                *s = ')';
+                
+                if( ret )
+                        return ret;
+        }
         
         if( sscanf( id, "%d", &nr ) == 1 && nr < 1000 )
@@ -141 +167 @@
 void account_off( irc_t *irc, account_t *a )
 {
-        account_offline( a->gc );
+        a->gc->wants_to_die = TRUE;
+        signoff( a->gc );
         a->gc = NULL;
         if( a->reconnect )