Changeset 673a54c for protocols/jabber

Timestamp:

2009-03-12T19:33:28Z (16 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

Location:

protocols/jabber

Files:

• conference.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• presence.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 );
         

protocols/jabber/jabber.c

@@ -425 +425 @@
 }
 
-static struct groupchat *jabber_chat_join_( struct im_connection *ic, char *room, char *nick, char *password )
+static struct groupchat *jabber_chat_join_( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         if( strchr( room, '@' ) == NULL )

protocols/jabber/jabber.h

@@ -240 +240 @@
 
 /* conference.c */
-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 groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name );
 void jabber_chat_free( struct groupchat *c );

protocols/jabber/presence.c

@@ -49 +49 @@
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Warning: Could not handle presence information from JID: %s", from );
+                        /*
+                        imcb_log( ic, "Warning: Could not handle presence information from JID: %s", from );
+                        */
                         return XT_HANDLED;
                 }
@@ -106 +107 @@
                 if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
                 {
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Warning: Received presence information from unknown JID: %s", from );
+                        /*
+                        imcb_log( ic, "Warning: Received presence information from unknown JID: %s", from );
+                        */
                         return XT_HANDLED;
                 }