comparison src/away.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 b808f9734879
children 34f87e4078fc
comparison
equal deleted inserted replaced
6639:1b91cb6be4c3 6640:314111e7b601
68 GaimAccount *account = NULL; 68 GaimAccount *account = NULL;
69 69
70 if (g_list_index(gaim_accounts_get_all(), qm->account) >= 0) 70 if (g_list_index(gaim_accounts_get_all(), qm->account) >= 0)
71 account = qm->account; 71 account = qm->account;
72 72
73 cnv = gaim_find_conversation(name); 73 cnv = gaim_find_conversation_with_account(name, account);
74 74
75 if (!cnv) 75 if (!cnv)
76 cnv = gaim_conversation_new(GAIM_CONV_IM, account, qm->name); 76 cnv = gaim_conversation_new(GAIM_CONV_IM, account, qm->name);
77 else 77 else
78 gaim_conversation_set_account(cnv, account); 78 gaim_conversation_set_account(cnv, account);
86 } else { 86 } else {
87 templist = templist->next; 87 templist = templist->next;
88 } 88 }
89 } 89 }
90 } 90 }
91 91
92 g_free(name); 92 g_free(name);
93 /* In GTK 2.2, _store_remove actually returns whether iter is valid or not 93 /* In GTK 2.2, _store_remove actually returns whether iter is valid or not
94 * after the remove, but in GTK 2.0 it is a void function. */ 94 * after the remove, but in GTK 2.0 it is a void function. */
95 gtk_list_store_remove(awayqueuestore, iter); 95 gtk_list_store_remove(awayqueuestore, iter);
96 } 96 }
108 account = NULL; 108 account = NULL;
109 109
110 if (g_list_index(gaim_accounts_get_all(), qm->account) >= 0) 110 if (g_list_index(gaim_accounts_get_all(), qm->account) >= 0)
111 account = qm->account; 111 account = qm->account;
112 112
113 cnv = gaim_find_conversation(qm->name); 113 cnv = gaim_find_conversation_with_account(qm->name, account);
114 114
115 if (!cnv) 115 if (!cnv)
116 cnv = gaim_conversation_new(GAIM_CONV_IM, account, qm->name); 116 cnv = gaim_conversation_new(GAIM_CONV_IM, account, qm->name);
117 else 117 else
118 gaim_conversation_set_account(cnv, account); 118 gaim_conversation_set_account(cnv, account);