Mercurial > pidgin
diff libpurple/protocols/msn/contact.h @ 21107:ca624eda4267
merge of '3380c786d272dcd9ab1360f49c3e4e51227af663'
and 'c0e79d15a4fe4c5b0129fcae5060754b25f72a56'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 24 Oct 2007 06:45:26 +0000 |
parents | ce701480237b 90fd0826c6ce |
children | 5cdd93dac7a2 b70f30dd4753 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.h Wed Oct 24 02:48:32 2007 +0000 +++ b/libpurple/protocols/msn/contact.h Wed Oct 24 06:45:26 2007 +0000 @@ -380,6 +380,7 @@ gchar * guid; MsnListId list_id; MsnCallbackAction action; + MsnSession *session; }; typedef enum @@ -397,7 +398,7 @@ MsnContact * msn_contact_new(MsnSession *session); void msn_contact_destroy(MsnContact *contact); -MsnCallbackState * msn_callback_state_new(void); +MsnCallbackState * msn_callback_state_new(MsnSession *session); void msn_callback_state_free(MsnCallbackState *state); void msn_callback_state_set_who(MsnCallbackState *state, const gchar *who); void msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid);