Changeset 8b8def58 for protocols/jabber

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.

Location:

protocols/jabber

Files:

• iq.c (modified) (2 diffs)
• jabber.c (modified) (2 diffs)
• message.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -65 +65 @@
                 if( strcmp( s, XMLNS_VERSION ) == 0 )
                 {
-                        xt_add_child( reply, xt_new_node( "name", "BitlBee", NULL ) );
+                        xt_add_child( reply, xt_new_node( "name", set_getstr( &ic->acc->set, "user_agent" ), NULL ) );
                         xt_add_child( reply, xt_new_node( "version", BITLBEE_VERSION, NULL ) );
                         xt_add_child( reply, xt_new_node( "os", ARCH, NULL ) );
@@ -108 +108 @@
                         xt_add_attr( c, "category", "client" );
                         xt_add_attr( c, "type", "pc" );
-                        xt_add_attr( c, "name", "BitlBee" );
+                        xt_add_attr( c, "name", set_getstr( &ic->acc->set, "user_agent" ) );
                         xt_add_child( reply, c );
                         

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

protocols/jabber/message.c

@@ -55 +55 @@
                         struct xt_node *inv, *reason;
                         
-                        if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&
+                        if( ns && strcmp( ns, XMLNS_MUC_USER ) == 0 &&
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {