Mercurial > pidgin.yaz

comparison libpurple/protocols/yahoo/libymsg.c @ 27398:7f008ce8604b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I believe this will correctly handle setting the yd->jp value under the new two-prpl model. I still need to put a migration path in for existing Yahoo! JAPAN accounts.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 05 Jul 2009 14:31:37 +0000
parents 1f30c4a47e3d
children 31534ae3406a
comparison
equal deleted inserted replaced
27397:1f30c4a47e3d 27398:7f008ce8604b
3426 yd->current_status = get_yahoo_status_from_purple_status(status); 3426 yd->current_status = get_yahoo_status_from_purple_status(status);
3427 3427
3428 yahoo_server_check(account); 3428 yahoo_server_check(account);
3429 yahoo_picture_check(account); 3429 yahoo_picture_check(account);
3430 3430
3431 if (purple_account_get_bool(account, "yahoojp", FALSE)) { 3431 if (purple_strequal(purple_account_get_protocol_id(account), "yahoojp")) {
3432 yd->jp = TRUE; 3432 yd->jp = TRUE;
3433 if (purple_proxy_connect(gc, account, 3433 if (purple_proxy_connect(gc, account,
3434 purple_account_get_string(account, "serverjp", YAHOOJP_PAGER_HOST), 3434 purple_account_get_string(account, "server", YAHOOJP_PAGER_HOST),
3435 purple_account_get_int(account, "port", YAHOO_PAGER_PORT), 3435 purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
3436 yahoo_got_connected, gc) == NULL) 3436 yahoo_got_connected, gc) == NULL)
3437 { 3437 {
3438 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, 3438 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
3439 _("Connection problem")); 3439 _("Connection problem"));