diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-12-07 21:54:19 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-12-07 21:54:19 +0000 |
| commit | 2288705af462b4aca2d56f228bff269eab8d8b5f (patch) | |
| tree | cbdf792579f11297773583cc822548867fdfc19c /protocols/jabber/jabber.h | |
| parent | aac40178a6669e20855b7f5d3cc6a82cba10042e (diff) | |
| parent | 36cf9fda6a5cc4bcbfe98319b48af636fa142590 (diff) | |
Merging head.
Diffstat (limited to 'protocols/jabber/jabber.h')
| -rw-r--r-- | protocols/jabber/jabber.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h index cc12bdbb..9f101f83 100644 --- a/protocols/jabber/jabber.h +++ b/protocols/jabber/jabber.h @@ -26,8 +26,9 @@ #include <glib.h> -#include "xmltree.h" #include "bitlbee.h" +#include "md5.h" +#include "xmltree.h" extern GSList *jabber_connections; @@ -301,7 +302,7 @@ xt_status sasl_pkt_result( struct xt_node *node, gpointer data ); gboolean sasl_supported( struct im_connection *ic ); /* 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 ); int jabber_chat_msg( struct groupchat *ic, char *message, int flags ); |