Changeset 68b518d6 for irc.c


Ignore:
Timestamp:
2006-05-26T09:03:38Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
cdca30b
Parents:
41ca004 (diff), c53911e (diff), 7bfd574 (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 from main development tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    r41ca004 r68b518d6  
    832832                        irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
    833833                else
    834                         irc_reply( irc, 331, "%s :No topic for this channel" );
     834                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
    835835        }
    836836}
     
    888888        if( g_hash_table_lookup( irc->watches, nick ) )
    889889        {
    890                 irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged online" );
     890                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
    891891        }
    892892        g_free( nick );
     
    913913        if( g_hash_table_lookup( irc->watches, nick ) )
    914914        {
    915                 irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged offline" );
     915                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
    916916        }
    917917        g_free( nick );
     
    10131013        else if( c && c->gc && c->gc->prpl )
    10141014        {
    1015                 return( serv_send_chat( irc, c->gc, c->id, s ) );
     1015                return( bim_chat_msg( c->gc, c->id, s ) );
    10161016        }
    10171017       
     
    10231023        user_t *u = data;
    10241024       
     1025        /* Shouldn't happen, but just to be sure. */
     1026        if( u->sendbuf_len < 2 )
     1027                return FALSE;
     1028       
    10251029        u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
    1026         serv_send_im( u->gc->irc, u, u->sendbuf, u->sendbuf_flags );
     1030        bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );
    10271031       
    10281032        g_free( u->sendbuf );
     
    10451049                if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
    10461050                {
    1047                         //Flush the buffer
     1051                        /* Flush the buffer */
    10481052                        b_event_remove( u->sendbuf_timer );
    10491053                        buddy_send_handler_delayed( u, -1, 0 );
     
    10531057                {
    10541058                        u->sendbuf_len = strlen( msg ) + 2;
    1055                         u->sendbuf = g_new (char, u->sendbuf_len );
     1059                        u->sendbuf = g_new( char, u->sendbuf_len );
    10561060                        u->sendbuf[0] = 0;
    10571061                        u->sendbuf_flags = flags;
     
    10601064                {
    10611065                        u->sendbuf_len += strlen( msg ) + 1;
    1062                         u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
     1066                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
    10631067                }
    10641068               
     
    10761080        else
    10771081        {
    1078                 serv_send_im( irc, u, msg, flags );
     1082                bim_buddy_msg( u->gc, u->handle, msg, flags );
    10791083        }
    10801084}
Note: See TracChangeset for help on using the changeset viewer.