Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/contact.h @ 21103:aa875e77e5ce
explicit merge of '3380c786d272dcd9ab1360f49c3e4e51227af663'
and 'c0e79d15a4fe4c5b0129fcae5060754b25f72a56'
to branch 'im.pidgin.cpw.khc.soap'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 07:39:26 +0000 |
parents | ce701480237b 90fd0826c6ce |
children | 5cdd93dac7a2 b70f30dd4753 |
comparison
equal
deleted
inserted
replaced
21102:f387e8c671a4 | 21103:aa875e77e5ce |
---|---|
378 gchar * old_group_name; | 378 gchar * old_group_name; |
379 gchar * new_group_name; | 379 gchar * new_group_name; |
380 gchar * guid; | 380 gchar * guid; |
381 MsnListId list_id; | 381 MsnListId list_id; |
382 MsnCallbackAction action; | 382 MsnCallbackAction action; |
383 MsnSession *session; | |
383 }; | 384 }; |
384 | 385 |
385 typedef enum | 386 typedef enum |
386 { | 387 { |
387 MSN_PS_INITIAL, | 388 MSN_PS_INITIAL, |
395 * function prototype | 396 * function prototype |
396 ************************************************/ | 397 ************************************************/ |
397 MsnContact * msn_contact_new(MsnSession *session); | 398 MsnContact * msn_contact_new(MsnSession *session); |
398 void msn_contact_destroy(MsnContact *contact); | 399 void msn_contact_destroy(MsnContact *contact); |
399 | 400 |
400 MsnCallbackState * msn_callback_state_new(void); | 401 MsnCallbackState * msn_callback_state_new(MsnSession *session); |
401 void msn_callback_state_free(MsnCallbackState *state); | 402 void msn_callback_state_free(MsnCallbackState *state); |
402 void msn_callback_state_set_who(MsnCallbackState *state, const gchar *who); | 403 void msn_callback_state_set_who(MsnCallbackState *state, const gchar *who); |
403 void msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid); | 404 void msn_callback_state_set_uid(MsnCallbackState *state, const gchar *uid); |
404 void msn_callback_state_set_old_group_name(MsnCallbackState *state, | 405 void msn_callback_state_set_old_group_name(MsnCallbackState *state, |
405 const gchar *old_group_name); | 406 const gchar *old_group_name); |