comparison src/protocols/silc/ops.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 25 Aug 2005 02:33:44 +0000
parents 07dc8c6a359f
children 9c7ca8a8c4b8
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
61 SilcGaimPrvgrp prv; 61 SilcGaimPrvgrp prv;
62 62
63 for (l = sg->grps; l; l = l->next) 63 for (l = sg->grps; l; l = l->next)
64 if (((SilcGaimPrvgrp)l->data)->key == key) { 64 if (((SilcGaimPrvgrp)l->data)->key == key) {
65 prv = l->data; 65 prv = l->data;
66 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 66 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
67 prv->channel, sg->account); 67 prv->channel, sg->account);
68 break; 68 break;
69 } 69 }
70 } 70 }
71 if (!convo) 71 if (!convo)
72 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 72 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
73 channel->channel_name, sg->account); 73 channel->channel_name, sg->account);
74 if (!convo) 74 if (!convo)
75 return; 75 return;
76 76
77 if (flags & SILC_MESSAGE_FLAG_SIGNED && 77 if (flags & SILC_MESSAGE_FLAG_SIGNED &&
147 147
148 if (!message) 148 if (!message)
149 return; 149 return;
150 150
151 if (sender->nickname) 151 if (sender->nickname)
152 /* XXX - Should this be GAIM_CONV_IM? */ 152 /* XXX - Should this be GAIM_CONV_TYPE_IM? */
153 convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, 153 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY,
154 sender->nickname, sg->account); 154 sender->nickname, sg->account);
155 155
156 if (flags & SILC_MESSAGE_FLAG_SIGNED && 156 if (flags & SILC_MESSAGE_FLAG_SIGNED &&
157 gaim_prefs_get_bool("/plugins/prpl/silc/verify_im")) { 157 gaim_prefs_get_bool("/plugins/prpl/silc/verify_im")) {
158 /* XXX */ 158 /* XXX */
263 263
264 /* If we joined channel, do nothing */ 264 /* If we joined channel, do nothing */
265 if (client_entry == conn->local_entry) 265 if (client_entry == conn->local_entry)
266 break; 266 break;
267 267
268 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 268 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
269 channel->channel_name, sg->account); 269 channel->channel_name, sg->account);
270 if (!convo) 270 if (!convo)
271 break; 271 break;
272 272
273 /* Join user to channel */ 273 /* Join user to channel */
280 280
281 case SILC_NOTIFY_TYPE_LEAVE: 281 case SILC_NOTIFY_TYPE_LEAVE:
282 client_entry = va_arg(va, SilcClientEntry); 282 client_entry = va_arg(va, SilcClientEntry);
283 channel = va_arg(va, SilcChannelEntry); 283 channel = va_arg(va, SilcChannelEntry);
284 284
285 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 285 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
286 channel->channel_name, sg->account); 286 channel->channel_name, sg->account);
287 if (!convo) 287 if (!convo)
288 break; 288 break;
289 289
290 /* Remove user from channel */ 290 /* Remove user from channel */
301 break; 301 break;
302 302
303 /* Remove from all channels */ 303 /* Remove from all channels */
304 silc_hash_table_list(client_entry->channels, &htl); 304 silc_hash_table_list(client_entry->channels, &htl);
305 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 305 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
306 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 306 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
307 chu->channel->channel_name, sg->account); 307 chu->channel->channel_name, sg->account);
308 if (!convo) 308 if (!convo)
309 continue; 309 continue;
310 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), 310 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
311 client_entry->nickname, 311 client_entry->nickname,
321 idtype = va_arg(va, int); 321 idtype = va_arg(va, int);
322 entry = va_arg(va, void *); 322 entry = va_arg(va, void *);
323 tmp = va_arg(va, char *); 323 tmp = va_arg(va, char *);
324 channel = va_arg(va, SilcChannelEntry); 324 channel = va_arg(va, SilcChannelEntry);
325 325
326 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 326 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
327 channel->channel_name, sg->account); 327 channel->channel_name, sg->account);
328 if (!convo) 328 if (!convo)
329 break; 329 break;
330 330
331 if (!tmp) 331 if (!tmp)
379 break; 379 break;
380 380
381 /* Change nick on all channels */ 381 /* Change nick on all channels */
382 silc_hash_table_list(client_entry2->channels, &htl); 382 silc_hash_table_list(client_entry2->channels, &htl);
383 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 383 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
384 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 384 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
385 chu->channel->channel_name, sg->account); 385 chu->channel->channel_name, sg->account);
386 if (!convo) 386 if (!convo)
387 continue; 387 continue;
388 if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), client_entry->nickname)) 388 if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), client_entry->nickname))
389 gaim_conv_chat_rename_user(GAIM_CONV_CHAT(convo), 389 gaim_conv_chat_rename_user(GAIM_CONV_CHAT(convo),
403 (void)va_arg(va, char *); 403 (void)va_arg(va, char *);
404 (void)va_arg(va, SilcPublicKey); 404 (void)va_arg(va, SilcPublicKey);
405 buffer = va_arg(va, SilcBuffer); 405 buffer = va_arg(va, SilcBuffer);
406 channel = va_arg(va, SilcChannelEntry); 406 channel = va_arg(va, SilcChannelEntry);
407 407
408 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 408 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
409 channel->channel_name, sg->account); 409 channel->channel_name, sg->account);
410 if (!convo) 410 if (!convo)
411 break; 411 break;
412 412
413 if (idtype == SILC_ID_CLIENT) 413 if (idtype == SILC_ID_CLIENT)
440 entry = va_arg(va, void *); 440 entry = va_arg(va, void *);
441 mode = va_arg(va, SilcUInt32); 441 mode = va_arg(va, SilcUInt32);
442 client_entry2 = va_arg(va, SilcClientEntry); 442 client_entry2 = va_arg(va, SilcClientEntry);
443 channel = va_arg(va, SilcChannelEntry); 443 channel = va_arg(va, SilcChannelEntry);
444 444
445 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 445 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
446 channel->channel_name, sg->account); 446 channel->channel_name, sg->account);
447 if (!convo) 447 if (!convo)
448 break; 448 break;
449 449
450 if (idtype == SILC_ID_CLIENT) 450 if (idtype == SILC_ID_CLIENT)
486 client_entry = va_arg(va, SilcClientEntry); 486 client_entry = va_arg(va, SilcClientEntry);
487 tmp = va_arg(va, char *); 487 tmp = va_arg(va, char *);
488 client_entry2 = va_arg(va, SilcClientEntry); 488 client_entry2 = va_arg(va, SilcClientEntry);
489 channel = va_arg(va, SilcChannelEntry); 489 channel = va_arg(va, SilcChannelEntry);
490 490
491 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 491 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
492 channel->channel_name, sg->account); 492 channel->channel_name, sg->account);
493 if (!convo) 493 if (!convo)
494 break; 494 break;
495 495
496 if (client_entry == conn->local_entry) { 496 if (client_entry == conn->local_entry) {
541 } 541 }
542 542
543 /* Remove us from all channels */ 543 /* Remove us from all channels */
544 silc_hash_table_list(client_entry->channels, &htl); 544 silc_hash_table_list(client_entry->channels, &htl);
545 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 545 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
546 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 546 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
547 chu->channel->channel_name, sg->account); 547 chu->channel->channel_name, sg->account);
548 if (!convo) 548 if (!convo)
549 continue; 549 continue;
550 gaim_conv_chat_write(GAIM_CONV_CHAT(convo), client_entry->nickname, 550 gaim_conv_chat_write(GAIM_CONV_CHAT(convo), client_entry->nickname,
551 buf, GAIM_MESSAGE_SYSTEM, time(NULL)); 551 buf, GAIM_MESSAGE_SYSTEM, time(NULL));
572 } 572 }
573 573
574 /* Remove user from all channels */ 574 /* Remove user from all channels */
575 silc_hash_table_list(client_entry->channels, &htl); 575 silc_hash_table_list(client_entry->channels, &htl);
576 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 576 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
577 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 577 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
578 chu->channel->channel_name, sg->account); 578 chu->channel->channel_name, sg->account);
579 if (!convo) 579 if (!convo)
580 continue; 580 continue;
581 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), 581 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
582 client_entry->nickname, tmp); 582 client_entry->nickname, tmp);
605 605
606 /* Remove from all channels */ 606 /* Remove from all channels */
607 silc_hash_table_list(clients[i]->channels, &htl); 607 silc_hash_table_list(clients[i]->channels, &htl);
608 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 608 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
609 convo = 609 convo =
610 gaim_find_conversation_with_account(GAIM_CONV_CHAT, 610 gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
611 chu->channel->channel_name, sg->account); 611 chu->channel->channel_name, sg->account);
612 if (!convo) 612 if (!convo)
613 continue; 613 continue;
614 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), 614 gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo),
615 clients[i]->nickname, 615 clients[i]->nickname,
1172 return; 1172 return;
1173 } 1173 }
1174 1174
1175 channel = va_arg(vp, SilcChannelEntry); 1175 channel = va_arg(vp, SilcChannelEntry);
1176 1176
1177 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 1177 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
1178 channel->channel_name, sg->account); 1178 channel->channel_name, sg->account);
1179 if (!convo) { 1179 if (!convo) {
1180 gaim_debug_error("silc", "Got a topic for %s, which doesn't exist\n", 1180 gaim_debug_error("silc", "Got a topic for %s, which doesn't exist\n",
1181 channel->channel_name); 1181 channel->channel_name);
1182 break; 1182 break;
1207 local_entry = va_arg(vp, SilcClientEntry); 1207 local_entry = va_arg(vp, SilcClientEntry);
1208 1208
1209 /* Change nick on all channels */ 1209 /* Change nick on all channels */
1210 silc_hash_table_list(local_entry->channels, &htl); 1210 silc_hash_table_list(local_entry->channels, &htl);
1211 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) { 1211 while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
1212 convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, 1212 convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
1213 chu->channel->channel_name, sg->account); 1213 chu->channel->channel_name, sg->account);
1214 if (!convo) 1214 if (!convo)
1215 continue; 1215 continue;
1216 oldnick = gaim_conv_chat_get_nick(GAIM_CONV_CHAT(convo)); 1216 oldnick = gaim_conv_chat_get_nick(GAIM_CONV_CHAT(convo));
1217 if (strcmp(oldnick, local_entry->nickname)) { 1217 if (strcmp(oldnick, local_entry->nickname)) {