Changeset 8b8def58 for protocols/jabber
- Timestamp:
- 2010-06-24T09:14:34Z (15 years ago)
- 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. - Location:
- protocols/jabber
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/iq.c
r7cd2e8a r8b8def58 65 65 if( strcmp( s, XMLNS_VERSION ) == 0 ) 66 66 { 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 ) ); 68 68 xt_add_child( reply, xt_new_node( "version", BITLBEE_VERSION, NULL ) ); 69 69 xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) ); … … 108 108 xt_add_attr( c, "category", "client" ); 109 109 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" ) ); 111 111 xt_add_child( reply, c ); 112 112 -
protocols/jabber/jabber.c
r7cd2e8a r8b8def58 81 81 s = set_add( &acc->set, "tls", "try", set_eval_tls, acc ); 82 82 s->flags |= ACC_SET_OFFLINE_ONLY; 83 84 s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc ); 83 85 84 86 s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc ); … … 486 488 { 487 489 /* 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; 489 492 490 493 /* This runs the garbage collection every minute, which means every packet -
protocols/jabber/message.c
r7cd2e8a r8b8def58 55 55 struct xt_node *inv, *reason; 56 56 57 if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&57 if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 && 58 58 ( inv = xt_find_node( c->children, "invite" ) ) ) 59 59 {
Note: See TracChangeset
for help on using the changeset viewer.