Changeset 8b8def58 for protocols/jabber/jabber.c

Timestamp:

2010-06-24T09:14:34Z (14 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.

File:

• protocols/jabber/jabber.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -81 +81 @@
         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 );
@@ -486 +488 @@
 {
         /* 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