# HG changeset patch # User ivan.komarov@soc.pidgin.im # Date 1288731306 0 # Node ID 56e1f06471a9ceb89e0df00d4b720aea77338ac1 # Parent e9e41a04513dcadb9b40457f5dfdaec3209992b3 Removed an abstruse Easter Egg from 869efa8a750e9eee235af2ec631e7554cb373778. Mark says he's OK with it. diff -r e9e41a04513d -r 56e1f06471a9 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Tue Nov 02 20:51:44 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Nov 02 20:55:06 2010 +0000 @@ -73,7 +73,6 @@ static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; static guint8 features_icq[] = {0x01}; -static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; struct create_room { char *name; @@ -376,12 +375,10 @@ aim_request_login(od, conn, purple_account_get_username(account)); purple_debug_info("oscar", "Username sent, waiting for response\n"); purple_connection_update_progress(gc, _("Username sent"), 1, OSCAR_CONNECT_STEPS); - ck[1] = 0x65; } else if (conn->type == SNAC_FAMILY_LOCATE) { purple_connection_update_progress(gc, _("Connection established, cookie sent"), 4, OSCAR_CONNECT_STEPS); - ck[4] = 0x61; } else if (conn->type == SNAC_FAMILY_CHAT) { @@ -782,7 +779,6 @@ } purple_connection_update_progress(gc, _("Connecting"), 0, OSCAR_CONNECT_STEPS); - ck[0] = 0x5a; } void @@ -1006,7 +1002,6 @@ od->default_port = port; purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS); - ck[3] = 0x64; return 1; } @@ -1126,7 +1121,6 @@ } purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS); - ck[3] = 0x64; return 1; } @@ -1210,7 +1204,6 @@ purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS)); purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); - ck[2] = 0x6c; return 1; } @@ -1481,13 +1474,6 @@ return 1; } -static void purple_check_comment(OscarData *od, const char *str) { - if ((str == NULL) || strcmp(str, (const char *)ck)) - aim_locate_setcaps(od, purple_caps); - else - aim_locate_setcaps(od, purple_caps | OSCAR_CAPABILITY_SECUREIM); -} - static int purple_parse_offgoing(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { PurpleConnection *gc = od->gc; PurpleAccount *account = purple_connection_get_account(gc); @@ -3927,14 +3913,6 @@ "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname); purple_blist_add_buddy(b, NULL, g, NULL); } - if (!oscar_util_name_compare(curitem->name, purple_account_get_username(account))) { - char *comment = aim_ssi_getcomment(od->ssi.local, gname, curitem->name); - if (comment != NULL) - { - purple_check_comment(od, comment); - g_free(comment); - } - } /* Mobile users should always be online */ if (curitem->name[0] == '+') { @@ -4803,7 +4781,6 @@ OscarData *od; PurpleBuddy *b; PurpleGroup *g; - const char *username; gc = data->gc; od = purple_connection_get_protocol_data(gc); @@ -4822,11 +4799,6 @@ } aim_ssi_editcomment(od, purple_group_get_name(g), data->name, text); - - username = purple_account_get_username(account); - if (!oscar_util_name_compare(data->name, username)) - purple_check_comment(od, text); - oscar_free_name_data(data); }