diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-24 10:14:34 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-24 10:14:34 +0100 |
| commit | 8b8def5854857248f66b6a2580ce2e5a8f5597c8 (patch) | |
| tree | 36d6328e966fed589f46076936fc50ff8063ed50 /protocols/jabber/jabber.c | |
| parent | 7cd2e8a6c0ba091f56e6ee8bc087c799faee3662 (diff) | |
| parent | 38ff846b14f1d1f80983a0818b9bcf60581a2a34 (diff) | |
Merging a few revisions from mainline.
Diffstat (limited to 'protocols/jabber/jabber.c')
| -rw-r--r-- | protocols/jabber/jabber.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index d5948958..7147a628 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -81,6 +81,8 @@ static void jabber_init( account_t *acc ) s = set_add( &acc->set, "tls", "try", set_eval_tls, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; + s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc ); + s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc ); s->flags |= ACC_SET_OFFLINE_ONLY; @@ -485,7 +487,8 @@ static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg ) static void jabber_keepalive( struct im_connection *ic ) { /* Just any whitespace character is enough as a keepalive for XMPP sessions. */ - jabber_write( ic, "\n", 1 ); + if( !jabber_write( ic, "\n", 1 ) ) + return; /* This runs the garbage collection every minute, which means every packet is in the cache for about a minute (which should be enough AFAIK). */ |