Mercurial > pidgin.yaz

comparison src/protocols/msn/switchboard.c @ 5566:9896e9068bc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5968] MSN compiles. Ship it! committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 30 May 2003 18:31:15 +0000
parents 187c740f2a4e
children 6275ac113622
comparison
equal deleted inserted replaced
5565:c3c4aaf69f65 5566:9896e9068bc4
81 **************************************************************************/ 81 **************************************************************************/
82 static gboolean 82 static gboolean
83 __ans_cmd(MsnServConn *servconn, const char *command, const char **params, 83 __ans_cmd(MsnServConn *servconn, const char *command, const char **params,
84 size_t param_count) 84 size_t param_count)
85 { 85 {
86 GaimConnection *gc = servconn->session->account->gc; 86 GaimAccount *account = servconn->session->account;
87 MsnSwitchBoard *swboard = servconn->data; 87 MsnSwitchBoard *swboard = servconn->data;
88 88
89 if (swboard->chat != NULL) 89 if (swboard->chat != NULL)
90 gaim_chat_add_user(GAIM_CHAT(swboard->chat), gc->username, NULL); 90 gaim_chat_add_user(GAIM_CHAT(swboard->chat),
91 gaim_account_get_username(account), NULL);
91 92
92 return __send_clientcaps(swboard); 93 return __send_clientcaps(swboard);
93 } 94 }
94 95
95 static gboolean 96 static gboolean
138 139
139 static gboolean 140 static gboolean
140 __iro_cmd(MsnServConn *servconn, const char *command, const char **params, 141 __iro_cmd(MsnServConn *servconn, const char *command, const char **params,
141 size_t param_count) 142 size_t param_count)
142 { 143 {
143 GaimConnection *gc = servconn->session->account->gc; 144 GaimAccount *account = servconn->session->account;
145 GaimConnection *gc = account->gc;
144 MsnSwitchBoard *swboard = servconn->data; 146 MsnSwitchBoard *swboard = servconn->data;
145 147
146 swboard->total_users = atoi(params[2]); 148 swboard->total_users = atoi(params[2]);
147 149
148 if (swboard->total_users > 1) { 150 if (swboard->total_users > 1) {
152 154
153 gaim_chat_add_user(GAIM_CHAT(swboard->chat), params[3], NULL); 155 gaim_chat_add_user(GAIM_CHAT(swboard->chat), params[3], NULL);
154 } 156 }
155 157
156 if (swboard->chat != NULL) 158 if (swboard->chat != NULL)
157 gaim_chat_add_user(GAIM_CHAT(swboard->chat), gc->username, NULL); 159 gaim_chat_add_user(GAIM_CHAT(swboard->chat),
160 gaim_account_get_username(account), NULL);
158 161
159 return TRUE; 162 return TRUE;
160 } 163 }
161 164
162 static gboolean 165 static gboolean
163 __joi_cmd(MsnServConn *servconn, const char *command, const char **params, 166 __joi_cmd(MsnServConn *servconn, const char *command, const char **params,
164 size_t param_count) 167 size_t param_count)
165 { 168 {
166 GaimConnection *gc = servconn->session->account->gc; 169 GaimAccount *account = servconn->session->account;
170 GaimConnection *gc = account->gc;
167 MsnSwitchBoard *swboard = servconn->data; 171 MsnSwitchBoard *swboard = servconn->data;
168 const char *passport; 172 const char *passport;
169 173
170 passport = params[0]; 174 passport = params[0];
171 175
172 if (swboard->total_users == 1) { 176 if (swboard->total_users == 1) {
173 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id, 177 swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
174 "MSN Chat"); 178 "MSN Chat");
175 gaim_chat_add_user(GAIM_CHAT(swboard->chat), 179 gaim_chat_add_user(GAIM_CHAT(swboard->chat),
176 msn_user_get_passport(swboard->user), NULL); 180 msn_user_get_passport(swboard->user), NULL);
177 gaim_chat_add_user(GAIM_CHAT(swboard->chat), gc->username, NULL); 181 gaim_chat_add_user(GAIM_CHAT(swboard->chat),
182 gaim_account_get_username(account), NULL);
178 183
179 msn_user_unref(swboard->user); 184 msn_user_unref(swboard->user);
180 } 185 }
181 186
182 if (swboard->chat != NULL) 187 if (swboard->chat != NULL)
341 **************************************************************************/ 346 **************************************************************************/
342 static gboolean 347 static gboolean
343 __connect_cb(gpointer data, gint source, GaimInputCondition cond) 348 __connect_cb(gpointer data, gint source, GaimInputCondition cond)
344 { 349 {
345 MsnServConn *servconn = data; 350 MsnServConn *servconn = data;
351 GaimAccount *account = servconn->session->account;
346 MsnSwitchBoard *swboard = servconn->data; 352 MsnSwitchBoard *swboard = servconn->data;
347 char outparams[MSN_BUF_LEN]; 353 char outparams[MSN_BUF_LEN];
348 354
349 if (servconn->fd != source) 355 if (servconn->fd != source)
350 servconn->fd = source; 356 servconn->fd = source;
353 359
354 gaim_debug(GAIM_DEBUG_INFO, "msn", "Connecting to switchboard...\n"); 360 gaim_debug(GAIM_DEBUG_INFO, "msn", "Connecting to switchboard...\n");
355 361
356 if (msn_switchboard_is_invited(swboard)) { 362 if (msn_switchboard_is_invited(swboard)) {
357 g_snprintf(outparams, sizeof(outparams), "%s %s %s", 363 g_snprintf(outparams, sizeof(outparams), "%s %s %s",
358 servconn->session->account->gc->username, 364 gaim_account_get_username(account),
359 swboard->auth_key, swboard->session_id); 365 swboard->auth_key, swboard->session_id);
360 366
361 if (!msn_switchboard_send_command(swboard, "ANS", outparams)) { 367 if (!msn_switchboard_send_command(swboard, "ANS", outparams)) {
362 msn_switchboard_destroy(swboard); 368 msn_switchboard_destroy(swboard);
363 369
364 return FALSE; 370 return FALSE;
365 } 371 }
366 } 372 }
367 else { 373 else {
368 g_snprintf(outparams, sizeof(outparams), "%s %s", 374 g_snprintf(outparams, sizeof(outparams), "%s %s",
369 servconn->session->account->gc->username, swboard->auth_key); 375 gaim_account_get_username(account), swboard->auth_key);
370 376
371 if (!msn_switchboard_send_command(swboard, "USR", outparams)) { 377 if (!msn_switchboard_send_command(swboard, "USR", outparams)) {
372 msn_switchboard_destroy(swboard); 378 msn_switchboard_destroy(swboard);
373 379
374 return FALSE; 380 return FALSE;