Changeset 8b8def58 for protocols/jabber


Ignore:
Timestamp:
2010-06-24T09:14:34Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
41d415b
Parents:
7cd2e8a (diff), 38ff846 (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 a few revisions from mainline.

Location:
protocols/jabber
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/iq.c

    r7cd2e8a r8b8def58  
    6565                if( strcmp( s, XMLNS_VERSION ) == 0 )
    6666                {
    67                         xt_add_child( reply, xt_new_node( "name", "BitlBee", NULL ) );
     67                        xt_add_child( reply, xt_new_node( "name", set_getstr( &ic->acc->set, "user_agent" ), NULL ) );
    6868                        xt_add_child( reply, xt_new_node( "version", BITLBEE_VERSION, NULL ) );
    6969                        xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) );
     
    108108                        xt_add_attr( c, "category", "client" );
    109109                        xt_add_attr( c, "type", "pc" );
    110                         xt_add_attr( c, "name", "BitlBee" );
     110                        xt_add_attr( c, "name", set_getstr( &ic->acc->set, "user_agent" ) );
    111111                        xt_add_child( reply, c );
    112112                       
  • protocols/jabber/jabber.c

    r7cd2e8a r8b8def58  
    8181        s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
    8282        s->flags |= ACC_SET_OFFLINE_ONLY;
     83       
     84        s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
    8385       
    8486        s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
     
    486488{
    487489        /* Just any whitespace character is enough as a keepalive for XMPP sessions. */
    488         jabber_write( ic, "\n", 1 );
     490        if( !jabber_write( ic, "\n", 1 ) )
     491                return;
    489492       
    490493        /* This runs the garbage collection every minute, which means every packet
  • protocols/jabber/message.c

    r7cd2e8a r8b8def58  
    5555                        struct xt_node *inv, *reason;
    5656                       
    57                         if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&
     57                        if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
    5858                            ( inv = xt_find_node( c->children, "invite" ) ) )
    5959                        {
Note: See TracChangeset for help on using the changeset viewer.