comparison src/protocols/msn/switchboard.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 ecf3ce2e2ab1
children b4dc55d994bf
comparison
equal deleted inserted replaced
10245:c143a3fac58d 10246:a66cf83552dc
114 swboard->im_user = NULL; 114 swboard->im_user = NULL;
115 } 115 }
116 } 116 }
117 else if (swboard->conv == NULL) 117 else if (swboard->conv == NULL)
118 { 118 {
119 swboard->conv = gaim_find_conversation_with_account(user, account); 119 /* XXX - I think this should probably be GAIM_CONV_CHAT, but I'm hedging */
120 swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_ANY,
121 user, account);
120 } 122 }
121 else 123 else
122 { 124 {
123 gaim_debug_warning("msn", "This should not happen!" 125 gaim_debug_warning("msn", "This should not happen!"
124 "(msn_switchboard_add_user)\n"); 126 "(msn_switchboard_add_user)\n");
147 if (swboard->conv != NULL) 149 if (swboard->conv != NULL)
148 return swboard->conv; 150 return swboard->conv;
149 151
150 account = swboard->session->account; 152 account = swboard->session->account;
151 153
152 return gaim_find_conversation_with_account(swboard->im_user, account); 154 /* XXX - I think this should probably be GAIM_CONV_IM, but I'm hedging */
155 return gaim_find_conversation_with_account(GAIM_CONV_IM,
156 swboard->im_user, account);
153 } 157 }
154 158
155 void 159 void
156 msn_switchboard_report_user(MsnSwitchBoard *swboard, GaimMessageFlags flags, const char *msg) 160 msn_switchboard_report_user(MsnSwitchBoard *swboard, GaimMessageFlags flags, const char *msg)
157 { 161 {