Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/oscar.c @ 32218:eec7f176e21d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash selecting Tools->Set Mood when you're online with an ICQ account that is configured as an AIM account. (fixes #14437)
author Mark Doliner <mark@kingant.net>
date Tue, 26 Jul 2011 06:32:35 +0000
parents 2f74d4c0e63a
children a48d58e0512b 142429bcb4c8
comparison
equal deleted inserted replaced
32217:5b56656ff5a5 32218:eec7f176e21d
741 } 741 }
742 742
743 gc->flags |= PURPLE_CONNECTION_HTML; 743 gc->flags |= PURPLE_CONNECTION_HTML;
744 if (oscar_util_valid_name_icq((purple_account_get_username(account)))) { 744 if (oscar_util_valid_name_icq((purple_account_get_username(account)))) {
745 od->icq = TRUE; 745 od->icq = TRUE;
746 gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS;
747 } else { 746 } else {
748 gc->flags |= PURPLE_CONNECTION_AUTO_RESP; 747 gc->flags |= PURPLE_CONNECTION_AUTO_RESP;
749 } 748 }
749
750 /* Set this flag based on the protocol_id rather than the username,
751 because that is what's tied to the get_moods prpl callback. */
752 if (g_str_equal(purple_account_get_protocol_id(account), "prpl-icq"))
753 gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS;
750 754
751 od->default_port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT); 755 od->default_port = purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT);
752 756
753 encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION); 757 encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
754 if (!purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) { 758 if (!purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) {