Mercurial > pidgin

comparison src/gtkdialogs.c @ 11338:17142948653e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 90be432e8385
children 448bc3b8eb63
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
514 GaimGtkWindow *gtkwin; 514 GaimGtkWindow *gtkwin;
515 515
516 g_return_if_fail(account != NULL); 516 g_return_if_fail(account != NULL);
517 g_return_if_fail(username != NULL); 517 g_return_if_fail(username != NULL);
518 518
519 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, username, account); 519 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account);
520 520
521 if (conv == NULL) 521 if (conv == NULL)
522 conv = gaim_conversation_new(GAIM_CONV_IM, account, username); 522 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username);
523 523
524 win = gaim_conversation_get_window(conv); 524 win = gaim_conversation_get_window(conv);
525 gtkwin = GAIM_GTK_WINDOW(win); 525 gtkwin = GAIM_GTK_WINDOW(win);
526 526
527 gtk_window_present(GTK_WINDOW(gtkwin->window)); 527 gtk_window_present(GTK_WINDOW(gtkwin->window));
827 GaimBuddy *buddy; 827 GaimBuddy *buddy;
828 if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) { 828 if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) {
829 GaimConversation *conv; 829 GaimConversation *conv;
830 buddy = (GaimBuddy*)bnode; 830 buddy = (GaimBuddy*)bnode;
831 bnode = bnode->next; 831 bnode = bnode->next;
832 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, 832 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
833 buddy->name, 833 buddy->name,
834 buddy->account); 834 buddy->account);
835 if (gaim_account_is_connected(buddy->account)) { 835 if (gaim_account_is_connected(buddy->account)) {
836 serv_remove_buddy(buddy->account->gc, buddy, group); 836 serv_remove_buddy(buddy->account->gc, buddy, group);
837 gaim_blist_remove_buddy(buddy); 837 gaim_blist_remove_buddy(buddy);
889 gaim_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name); 889 gaim_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name);
890 /* TODO - Should remove from blist first... then call serv_remove_buddy()? */ 890 /* TODO - Should remove from blist first... then call serv_remove_buddy()? */
891 serv_remove_buddy(buddy->account->gc, buddy, group); 891 serv_remove_buddy(buddy->account->gc, buddy, group);
892 gaim_blist_remove_buddy(buddy); 892 gaim_blist_remove_buddy(buddy);
893 893
894 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, account); 894 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account);
895 if (conv != NULL) 895 if (conv != NULL)
896 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); 896 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);
897 897
898 g_free(name); 898 g_free(name);
899 } 899 }
928 name = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name(chat->components); 928 name = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl)->get_chat_name(chat->components);
929 929
930 gaim_blist_remove_chat(chat); 930 gaim_blist_remove_chat(chat);
931 931
932 if (name != NULL) { 932 if (name != NULL) {
933 conv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, name, account); 933 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, name, account);
934 g_free(name); 934 g_free(name);
935 } 935 }
936 936
937 if (conv != NULL) 937 if (conv != NULL)
938 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); 938 gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE);