Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/contact.c @ 31292:47b6eda87723
propagate from branch 'im.pidgin.pidgin' (head 07d0765c444a097af45c2650f54323afb900a07b)
to branch 'im.pidgin.soc.2010.msn-tlc' (head f3998422a4724ab424e4e2328f58fc0504856557)
author | masca@cpw.pidgin.im |
---|---|
date | Mon, 19 Jul 2010 21:11:32 +0000 |
parents | 230caecf5435 |
children | 23be655cc688 |
comparison
equal
deleted
inserted
replaced
30698:e874875a74a7 | 31292:47b6eda87723 |
---|---|
22 * You should have received a copy of the GNU General Public License | 22 * You should have received a copy of the GNU General Public License |
23 * along with this program; if not, write to the Free Software | 23 * along with this program; if not, write to the Free Software |
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA | 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
25 */ | 25 */ |
26 | 26 |
27 #include "msn.h" | 27 #include "internal.h" |
28 #include "debug.h" | |
29 | |
28 #include "contact.h" | 30 #include "contact.h" |
29 #include "xmlnode.h" | 31 #include "xmlnode.h" |
30 #include "group.h" | 32 #include "group.h" |
33 #include "msnutils.h" | |
31 #include "soap.h" | 34 #include "soap.h" |
32 #include "nexus.h" | 35 #include "nexus.h" |
36 #include "user.h" | |
33 | 37 |
34 const char *MsnSoapPartnerScenarioText[] = | 38 const char *MsnSoapPartnerScenarioText[] = |
35 { | 39 { |
36 "Initial", | 40 "Initial", |
37 "ContactSave", | 41 "ContactSave", |
1165 } | 1169 } |
1166 | 1170 |
1167 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL); | 1171 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL); |
1168 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL); | 1172 msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL); |
1169 | 1173 |
1170 if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) { | 1174 if (msn_user_is_in_list(user, MSN_LIST_PL)) { |
1171 msn_del_contact_from_list(state->session, NULL, state->who, MSN_LIST_PL); | 1175 msn_del_contact_from_list(state->session, NULL, state->who, MSN_LIST_PL); |
1172 return; | 1176 return; |
1173 } | 1177 } |
1174 } | 1178 } |
1175 | 1179 |