Mercurial > pidgin
comparison libpurple/protocols/msn/userlist.h @ 25237:401f548e3544
propagate from branch 'im.pidgin.pidgin' (head df6eba32e5b6b34d7483cbfb7e9f2e4c836ac35f)
to branch 'org.darkrain42.pidgin.buddy-add' (head 6831808999a270f8c1a128c7430a73d3dc0bfae2)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 21 Dec 2008 18:32:37 +0000 |
parents | 77873bca18bb |
children | fd5eedf131b4 |
comparison
equal
deleted
inserted
replaced
25172:125cac3e24ee | 25237:401f548e3544 |
---|---|
45 { | 45 { |
46 MsnSession *session; | 46 MsnSession *session; |
47 | 47 |
48 GList *users; /* Contains MsnUsers */ | 48 GList *users; /* Contains MsnUsers */ |
49 GList *groups; /* Contains MsnGroups */ | 49 GList *groups; /* Contains MsnGroups */ |
50 GList *pending; /* MsnUsers pending addition (waiting for FQY response) */ | |
50 | 51 |
51 GQueue *buddy_icon_requests; | 52 GQueue *buddy_icon_requests; |
52 int buddy_icon_window; | 53 int buddy_icon_window; |
53 guint buddy_icon_request_timer; | 54 guint buddy_icon_request_timer; |
54 | |
55 int fl_users_count; | |
56 | 55 |
57 }; | 56 }; |
58 | 57 |
59 gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id); | 58 gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id); |
60 gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id); | 59 gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id); |
91 void msn_userlist_remove_group_id(MsnUserList *userlist, const char *group_id); | 90 void msn_userlist_remove_group_id(MsnUserList *userlist, const char *group_id); |
92 | 91 |
93 void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who); | 92 void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who); |
94 void msn_userlist_add_buddy(MsnUserList *userlist, | 93 void msn_userlist_add_buddy(MsnUserList *userlist, |
95 const char *who, const char *group_name); | 94 const char *who, const char *group_name); |
95 void msn_userlist_save_pending_buddy(MsnUserList *userlist, | |
96 const char *who, | |
97 const char *group_name); | |
98 void msn_userlist_add_pending_buddy(MsnUserList *userlist, | |
99 const char *who, | |
100 /*MsnNetwork*/ int network); | |
96 void msn_userlist_move_buddy(MsnUserList *userlist, const char *who, | 101 void msn_userlist_move_buddy(MsnUserList *userlist, const char *who, |
97 const char *old_group_name, | 102 const char *old_group_name, |
98 const char *new_group_name); | 103 const char *new_group_name); |
99 | 104 |
100 gboolean msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who, | 105 gboolean msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who, |