aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/jabber.c
diff options
context:
space:
mode:
authorSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
committerSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
commit673a54c5a78afd1dd41b4cd8811df5ab65042583 (patch)
treebffaa961139ac2be20f0875ef0ed37c87d6b18a9 /protocols/jabber/jabber.c
parent823de9d44f262ea2364ac8ec6a1e18e0f7dab658 (diff)
parent9e768da723b4a770967efa0d4dcaf58ccef8917f (diff)
pretty blind try at merging in the latest trunk
Diffstat (limited to 'protocols/jabber/jabber.c')
-rw-r--r--protocols/jabber/jabber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 518c9506..6f7e1c05 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -424,7 +424,7 @@ static void jabber_remove_buddy( struct im_connection *ic, char *who, char *grou
presence_send_request( ic, who, "unsubscribe" );
}
-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 )
imcb_error( ic, "Invalid room name: %s", room );