Changeset 673a54c for protocols/jabber/conference.c

Timestamp:

2009-03-12T19:33:28Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

fc34fb5

Parents:

823de9d (diff), 9e768da (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:

pretty blind try at merging in the latest trunk

File:

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

protocols/jabber/conference.c

@@ -26 +26 @@
 static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password )
+struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         struct jabber_chat *jc;
@@ -36 +36 @@
         node = xt_new_node( "x", NULL, NULL );
         xt_add_attr( node, "xmlns", XMLNS_MUC );
-        node = jabber_make_packet( "presence", NULL, roomjid, node );
         if( password )
                 xt_add_child( node, xt_new_node( "password", password, NULL ) );
+        node = jabber_make_packet( "presence", NULL, roomjid, node );
         jabber_cache_add( ic, node, jabber_chat_join_failed );