Changeset 85e9644 for irc.c


Ignore:
Timestamp:
2006-06-07T13:36:19Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c121f89
Parents:
a312b6b (diff), 0025b51 (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 Jelmer's storage tree (with LDAP support).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    ra312b6b r85e9644  
    905905void irc_kill( irc_t *irc, user_t *u )
    906906{
    907         char *nick;
    908        
    909         irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
     907        char *nick, *s;
     908        char reason[64];
     909       
     910        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
     911        {
     912                if( u->gc->user->proto_opt[0][0] )
     913                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
     914                                    u->gc->user->proto_opt[0] );
     915                else if( ( s = strchr( u->gc->username, '@' ) ) )
     916                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
     917                                    s + 1 );
     918                else
     919                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
     920                                    u->gc->prpl->name, irc->myhost );
     921               
     922                /* proto_opt might contain garbage after the : */
     923                if( ( s = strchr( reason, ':' ) ) )
     924                        *s = 0;
     925        }
     926        else
     927        {
     928                strcpy( reason, "Leaving..." );
     929        }
     930       
     931        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
    910932       
    911933        nick = g_strdup( u->nick );
Note: See TracChangeset for help on using the changeset viewer.