Changeset eb6df6a for protocols/jabber/iq.c

Timestamp:

2010-07-11T17:21:21Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

be999a5

Parents:

3759849 (diff), 00540d4 (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:

merge with upstraem bitlbee 1.2.8

File:

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

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 ) );
@@ -105 +105 @@
                         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 );