comparison src/server.c @ 6640:314111e7b601

[gaim-migrate @ 7165] Changed several calls from gaim_find_conversation() to gaim_find_conversation_with_account(). committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 28 Aug 2003 01:18:50 +0000
parents 22346bcb50c2
children 0c5637b5462e
comparison
equal deleted inserted replaced
6639:1b91cb6be4c3 6640:314111e7b601
265 GaimPluginProtocolInfo *prpl_info = NULL; 265 GaimPluginProtocolInfo *prpl_info = NULL;
266 266
267 if (gc != NULL && gc->prpl != NULL) 267 if (gc != NULL && gc->prpl != NULL)
268 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); 268 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
269 269
270 c = gaim_find_conversation(name); 270 c = gaim_find_conversation_with_account(name, gc->account);
271 271
272 if (prpl_info && prpl_info->send_im) 272 if (prpl_info && prpl_info->send_im)
273 val = prpl_info->send_im(gc, name, message, len, imflags); 273 val = prpl_info->send_im(gc, name, message, len, imflags);
274 274
275 if (!(imflags & GAIM_IM_AUTO_RESP)) 275 if (!(imflags & GAIM_IM_AUTO_RESP))
1035 * Robot101 will fix this after his exams. honest. 1035 * Robot101 will fix this after his exams. honest.
1036 * I guess he didn't specify WHICH exams, exactly... 1036 * I guess he didn't specify WHICH exams, exactly...
1037 */ 1037 */
1038 if (docklet_count && 1038 if (docklet_count &&
1039 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") && 1039 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") &&
1040 !gaim_find_conversation(name)) { 1040 !gaim_find_conversation_with_account(name, gc->account)) {
1041 /* 1041 /*
1042 * We're gonna queue it up and wait for the user to ask for 1042 * We're gonna queue it up and wait for the user to ask for
1043 * it... probably by clicking the docklet or windows tray icon. 1043 * it... probably by clicking the docklet or windows tray icon.
1044 */ 1044 */
1045 struct queued_message *qm; 1045 struct queued_message *qm;
1232 1232
1233 void serv_got_typing(GaimConnection *gc, const char *name, int timeout, 1233 void serv_got_typing(GaimConnection *gc, const char *name, int timeout,
1234 GaimTypingState state) { 1234 GaimTypingState state) {
1235 1235
1236 struct buddy *b; 1236 struct buddy *b;
1237 GaimConversation *cnv = gaim_find_conversation(name); 1237 GaimConversation *cnv = gaim_find_conversation_with_account(name, gc->account);
1238 GaimIm *im; 1238 GaimIm *im;
1239 1239
1240 if (!cnv) 1240 if (!cnv)
1241 return; 1241 return;
1242 1242
1261 gaim_im_start_typing_timeout(im, timeout); 1261 gaim_im_start_typing_timeout(im, timeout);
1262 } 1262 }
1263 1263
1264 void serv_got_typing_stopped(GaimConnection *gc, const char *name) { 1264 void serv_got_typing_stopped(GaimConnection *gc, const char *name) {
1265 1265
1266 GaimConversation *c = gaim_find_conversation(name); 1266 GaimConversation *c = gaim_find_conversation_with_account(name, gc->account);
1267 GaimIm *im; 1267 GaimIm *im;
1268 struct buddy *b; 1268 struct buddy *b;
1269 1269
1270 if (!c) 1270 if (!c)
1271 return; 1271 return;