Mercurial > pidgin.yaz

comparison src/protocols/msn/switchboard.c @ 7118:bf630f7dfdcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7685] Here's a commit that I think will make faceprint happy. GaimWindow -> GaimConvWindow, GaimIm -> GaimConvIm, GaimChat -> GaimConvChat, GaimBlistChat -> GaimChat, and updated the API functions as well. Plugin authors are going to hunt me down and murder me. I can feel it.. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 02 Oct 2003 02:54:07 +0000
parents 083d1e4a9c78
children ff9127038a5a
comparison
equal deleted inserted replaced
7117:943085b0ff8b 7118:bf630f7dfdcd
125 125
126 if (swboard->hidden) 126 if (swboard->hidden)
127 return TRUE; 127 return TRUE;
128 128
129 if (swboard->chat != NULL) 129 if (swboard->chat != NULL)
130 gaim_chat_remove_user(GAIM_CHAT(swboard->chat), user, NULL); 130 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(swboard->chat), user, NULL);
131 else { 131 else {
132 const char *username; 132 const char *username;
133 GaimConversation *conv; 133 GaimConversation *conv;
134 GaimBuddy *b; 134 GaimBuddy *b;
135 char buf[MSN_BUF_LEN]; 135 char buf[MSN_BUF_LEN];
186 conv = gaim_find_conversation_with_account(msn_user_get_passport(swboard->user), account); 186 conv = gaim_find_conversation_with_account(msn_user_get_passport(swboard->user), account);
187 187
188 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, 188 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
189 "MSN Chat"); 189 "MSN Chat");
190 190
191 gaim_chat_add_user(GAIM_CHAT(swboard->chat), 191 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat),
192 gaim_account_get_username(account), NULL); 192 gaim_account_get_username(account), NULL);
193 193
194 gaim_conversation_destroy(conv); 194 gaim_conversation_destroy(conv);
195 } 195 }
196 196
197 gaim_chat_add_user(GAIM_CHAT(swboard->chat), params[3], NULL); 197 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat), params[3], NULL);
198 } 198 }
199 199
200 return TRUE; 200 return TRUE;
201 } 201 }
202 202
217 conv = gaim_find_conversation_with_account( 217 conv = gaim_find_conversation_with_account(
218 msn_user_get_passport(swboard->user), account); 218 msn_user_get_passport(swboard->user), account);
219 219
220 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, 220 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
221 "MSN Chat"); 221 "MSN Chat");
222 gaim_chat_add_user(GAIM_CHAT(swboard->chat), 222 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat),
223 msn_user_get_passport(swboard->user), NULL); 223 msn_user_get_passport(swboard->user), NULL);
224 gaim_chat_add_user(GAIM_CHAT(swboard->chat), 224 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat),
225 gaim_account_get_username(account), NULL); 225 gaim_account_get_username(account), NULL);
226 226
227 msn_user_unref(swboard->user); 227 msn_user_unref(swboard->user);
228 228
229 gaim_conversation_destroy(conv); 229 gaim_conversation_destroy(conv);
230 } 230 }
231 231
232 if (swboard->chat != NULL) 232 if (swboard->chat != NULL)
233 gaim_chat_add_user(GAIM_CHAT(swboard->chat), passport, NULL); 233 gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->chat), passport, NULL);
234 234
235 swboard->total_users++; 235 swboard->total_users++;
236 236
237 while (servconn->txqueue) { 237 while (servconn->txqueue) {
238 char *buf = servconn->txqueue->data; 238 char *buf = servconn->txqueue->data;
285 { 285 {
286 GaimConnection *gc = servconn->session->account->gc; 286 GaimConnection *gc = servconn->session->account->gc;
287 MsnSwitchBoard *swboard = servconn->data; 287 MsnSwitchBoard *swboard = servconn->data;
288 288
289 if (swboard->chat != NULL) 289 if (swboard->chat != NULL)
290 serv_got_chat_left(gc, gaim_chat_get_id(GAIM_CHAT(swboard->chat))); 290 serv_got_chat_left(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(swboard->chat)));
291 291
292 msn_switchboard_destroy(swboard); 292 msn_switchboard_destroy(swboard);
293 293
294 return FALSE; 294 return FALSE;
295 } 295 }
347 g_free(pre_format); 347 g_free(pre_format);
348 g_free(post_format); 348 g_free(post_format);
349 } 349 }
350 350
351 if (swboard->chat != NULL) 351 if (swboard->chat != NULL)
352 serv_got_chat_in(gc, gaim_chat_get_id(GAIM_CHAT(swboard->chat)), 352 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(swboard->chat)),
353 servconn->msg_passport, 0, body, time(NULL)); 353 servconn->msg_passport, 0, body, time(NULL));
354 else 354 else
355 serv_got_im(gc, servconn->msg_passport, body, 0, time(NULL)); 355 serv_got_im(gc, servconn->msg_passport, body, 0, time(NULL));
356 356
357 g_free(body); 357 g_free(body);