Mercurial > ~mikael > mcabber > hg
diff mcabber/src/jabglue.h @ 1058:c0d44a9a99bc
Code cleanup
Cosmetics. Mostly get rid of "jid" variables, as it is a structure pointer
defined in libjabber/jabber.h.
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Thu, 30 Nov 2006 19:51:09 +0100 |
parents | 6eb1efea75d0 |
children | 2913310a7be6 |
line wrap: on
line diff
--- a/mcabber/src/jabglue.h Tue Nov 28 07:14:59 2006 +0100 +++ b/mcabber/src/jabglue.h Thu Nov 30 19:51:09 2006 +0100 @@ -44,24 +44,24 @@ char *compose_jid(const char *username, const char *servername, const char *resource); -jconn jb_connect(const char *jid, const char *server, unsigned int port, +jconn jb_connect(const char *fjid, const char *server, unsigned int port, int ssl, const char *pass); inline unsigned char jb_getonline(void); void jb_disconnect(void); void jb_main(void); -void jb_subscr_send_auth(const char *jid); -void jb_subscr_cancel_auth(const char *jid); -void jb_subscr_request_auth(const char *jid); -void jb_subscr_request_cancel(const char *jid); -void jb_addbuddy(const char *jid, const char *name, const char *group); -void jb_delbuddy(const char *jid); -void jb_updatebuddy(const char *jid, const char *name, const char *group); +void jb_subscr_send_auth(const char *bjid); +void jb_subscr_cancel_auth(const char *bjid); +void jb_subscr_request_auth(const char *bjid); +void jb_subscr_request_cancel(const char *bjid); +void jb_addbuddy(const char *bjid, const char *name, const char *group); +void jb_delbuddy(const char *bjid); +void jb_updatebuddy(const char *bjid, const char *name, const char *group); inline enum imstatus jb_getstatus(void); inline const char *jb_getstatusmsg(void); void jb_setstatus(enum imstatus st, const char *recipient, const char *msg, int do_not_sign); inline void jb_setprevstatus(void); -void jb_send_msg(const char *jid, const char *text, int type, +void jb_send_msg(const char *fjid, const char *text, int type, const char *subject, const char *id, guint *encrypted); void jb_send_raw(const char *str); void jb_send_chatstate(gpointer buddy, guint chatstate); @@ -71,11 +71,11 @@ void jb_room_join(const char *room, const char *nickname, const char *passwd); void jb_room_unlock(const char *room); void jb_room_destroy(const char *room, const char *venue, const char *reason); -void jb_room_invite(const char *room, const char *jid, const char *reason); -int jb_room_setattrib(const char *roomid, const char *jid, const char *nick, +void jb_room_invite(const char *room, const char *fjid, const char *reason); +int jb_room_setattrib(const char *roomid, const char *fjid, const char *nick, struct role_affil ra, const char *reason); void jb_iqs_display_list(void); -void jb_request(const char *jid, enum iqreq_type reqtype); +void jb_request(const char *fjid, enum iqreq_type reqtype); void jb_set_storage_bookmark(const char *roomid, const char *name, const char *nick, const char *passwd, int autojoin);