comparison src/server.c @ 10246:a66cf83552dc

[gaim-migrate @ 11386] I changed gaim_find_conversation and gaim_find_conversation_with_account The first parameter is now one of GAIM_CONV_IM, GAIM_CONV_CHAT or GAIM_CONV_ANY. Unfortunately, this changes a bajillion files. Please look over this and make sure I use the correct type everywhere. Especially in Novell and MSN, and somewhat in SILC. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 23 Nov 2004 06:14:15 +0000
parents 9f358a718f38
children 6a043ae92db6
comparison
equal deleted inserted replaced
10245:c143a3fac58d 10246:a66cf83552dc
265 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); 265 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
266 266
267 account = gaim_connection_get_account(gc); 267 account = gaim_connection_get_account(gc);
268 presence = gaim_account_get_presence(account); 268 presence = gaim_account_get_presence(account);
269 269
270 conv = gaim_find_conversation_with_account(name, gc->account); 270 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, 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, imflags); 273 val = prpl_info->send_im(gc, name, message, imflags);
274 274
275 if (!(imflags & GAIM_CONV_IM_AUTO_RESP)) 275 if (!(imflags & GAIM_CONV_IM_AUTO_RESP))
461 for (buds = buddies; buds; buds = buds->next) 461 for (buds = buddies; buds; buds = buds->next)
462 { 462 {
463 b = buds->data; 463 b = buds->data;
464 gaim_blist_server_alias_buddy(b, alias); 464 gaim_blist_server_alias_buddy(b, alias);
465 465
466 conv = gaim_find_conversation_with_account(b->name, account); 466 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, account);
467 467
468 if (conv != NULL && b->server_alias != NULL && 468 if (conv != NULL && b->server_alias != NULL &&
469 strcmp(b->server_alias, alias)) 469 strcmp(b->server_alias, alias))
470 { 470 {
471 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), 471 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
788 788
789 /* 789 /*
790 * We should update the conversation window buttons and menu, 790 * We should update the conversation window buttons and menu,
791 * if it exists. 791 * if it exists.
792 */ 792 */
793 cnv = gaim_find_conversation_with_account(who, gc->account); 793 cnv = gaim_find_conversation_with_account(GAIM_CONV_IM, who, gc->account);
794 794
795 /* 795 /*
796 * Plugin stuff. we pass a char ** but we don't want to pass what's 796 * Plugin stuff. we pass a char ** but we don't want to pass what's
797 * been given us by the prpls. So we create temp holders and pass 797 * been given us by the prpls. So we create temp holders and pass
798 * those instead. It's basically just to avoid segfaults. 798 * those instead. It's basically just to avoid segfaults.
1022 */ 1022 */
1023 /* XXX CORE/UI */ 1023 /* XXX CORE/UI */
1024 #if 0 1024 #if 0
1025 if (docklet_count && 1025 if (docklet_count &&
1026 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") && 1026 gaim_prefs_get_bool("/plugins/gtk/docklet/queue_messages") &&
1027 !gaim_find_conversation_with_account(name, gc->account)) { 1027 !gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account)) {
1028 /* 1028 /*
1029 * We're gonna queue it up and wait for the user to ask for 1029 * We're gonna queue it up and wait for the user to ask for
1030 * it... probably by clicking the docklet or windows tray icon. 1030 * it... probably by clicking the docklet or windows tray icon.
1031 */ 1031 */
1032 struct queued_message *qm; 1032 struct queued_message *qm;
1056 1056
1057 void serv_got_typing(GaimConnection *gc, const char *name, int timeout, 1057 void serv_got_typing(GaimConnection *gc, const char *name, int timeout,
1058 GaimTypingState state) { 1058 GaimTypingState state) {
1059 1059
1060 GaimBuddy *b; 1060 GaimBuddy *b;
1061 GaimConversation *cnv = gaim_find_conversation_with_account(name, gc->account); 1061 GaimConversation *cnv;
1062 GaimConvIm *im; 1062 GaimConvIm *im;
1063 1063
1064 cnv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account);
1064 if (!cnv) 1065 if (!cnv)
1065 return; 1066 return;
1066 1067
1067 im = GAIM_CONV_IM(cnv); 1068 im = GAIM_CONV_IM(cnv);
1068 1069
1090 gaim_conv_im_start_typing_timeout(im, timeout); 1091 gaim_conv_im_start_typing_timeout(im, timeout);
1091 } 1092 }
1092 1093
1093 void serv_got_typing_stopped(GaimConnection *gc, const char *name) { 1094 void serv_got_typing_stopped(GaimConnection *gc, const char *name) {
1094 1095
1095 GaimConversation *c = gaim_find_conversation_with_account(name, gc->account); 1096 GaimConversation *c;
1096 GaimConvIm *im; 1097 GaimConvIm *im;
1097 GaimBuddy *b; 1098 GaimBuddy *b;
1098 1099
1100 c = gaim_find_conversation_with_account(GAIM_CONV_IM, name, gc->account);
1099 if (!c) 1101 if (!c)
1100 return; 1102 return;
1101 1103
1102 im = GAIM_CONV_IM(c); 1104 im = GAIM_CONV_IM(c);
1103 1105