Mercurial > pidgin.yaz

comparison src/protocols/msn/switchboard.c @ 6831:a372cf34387e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7376] Fixed MSNSLP crashing! committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 14 Sep 2003 03:22:52 +0000
parents 1cfbb731aa1f
children bd433a45a463
comparison
equal deleted inserted replaced
6830:7ed61a258cb2 6831:a372cf34387e
92 MsnSwitchBoard *swboard = servconn->data; 92 MsnSwitchBoard *swboard = servconn->data;
93 MsnSession *session = servconn->session; 93 MsnSession *session = servconn->session;
94 94
95 send_clientcaps(swboard); 95 send_clientcaps(swboard);
96 96
97 if (0 && session->protocol_ver >= 9) 97 if (session->protocol_ver >= 9)
98 { 98 {
99 MsnUser *local_user, *remote_user; 99 MsnUser *local_user, *remote_user;
100 100
101 remote_user = msn_user_new(session, 101 remote_user = msn_user_new(session,
102 msn_user_get_passport(msn_switchboard_get_user(swboard)), 102 msn_user_get_passport(msn_switchboard_get_user(swboard)),
103 NULL); 103 NULL);
104 local_user = msn_user_new(session, 104 local_user = msn_user_new(session,
105 gaim_account_get_username(session->account), 105 gaim_account_get_username(session->account),
106 NULL); 106 NULL);
107 107
108 swboard->slp_session = msn_slp_session_new(swboard, TRUE); 108 if (msn_user_get_object(remote_user) != NULL)
109 109 {
110 msn_slp_session_request_user_display(swboard->slp_session, 110 swboard->slp_session = msn_slp_session_new(swboard, TRUE);
111 local_user, remote_user, 111
112 msn_user_get_object(remote_user)); 112 msn_slp_session_request_user_display(swboard->slp_session,
113 local_user, remote_user,
114 msn_user_get_object(remote_user));
115 }
113 } 116 }
114 117
115 return TRUE; 118 return TRUE;
116 } 119 }
117 120
212 passport = params[0]; 215 passport = params[0];
213 216
214 if (swboard->total_users == 2 && swboard->chat == NULL) { 217 if (swboard->total_users == 2 && swboard->chat == NULL) {
215 GaimConversation *conv; 218 GaimConversation *conv;
216 219
217 conv = gaim_find_conversation_with_account(msn_user_get_passport(swboard->user), account); 220 conv = gaim_find_conversation_with_account(
221 msn_user_get_passport(swboard->user), account);
218 222
219 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, 223 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
220 "MSN Chat"); 224 "MSN Chat");
221 gaim_chat_add_user(GAIM_CHAT(swboard->chat), 225 gaim_chat_add_user(GAIM_CHAT(swboard->chat),
222 msn_user_get_passport(swboard->user), NULL); 226 msn_user_get_passport(swboard->user), NULL);