# HG changeset patch # User Mark Doliner # Date 1268290713 0 # Node ID bddc2c8e8b98fcf6b51df3a75096ceb61816c70c # Parent 8b9359833987c8bd72b817b8054dc2a166558b91 Current versions of ICQ will happily scale down large icons to 100x100 (and in some places will scale up small icons). So we should stop scaling-on-send. Any icon between 0x0 and 100x100 is allowed, just like with AIM. Max file size still seems to be 7168. diff -r 8b9359833987 -r bddc2c8e8b98 libpurple/protocols/oscar/libaim.c --- a/libpurple/protocols/oscar/libaim.c Thu Mar 11 02:48:12 2010 +0000 +++ b/libpurple/protocols/oscar/libaim.c Thu Mar 11 06:58:33 2010 +0000 @@ -31,7 +31,6 @@ OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE, NULL, /* user_splits */ NULL, /* protocol_options */ - /* The mimimum icon size below is not needed in AIM 6.0 */ {"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ oscar_list_icon_aim, /* list_icon */ oscar_list_emblem, /* list_emblems */ diff -r 8b9359833987 -r bddc2c8e8b98 libpurple/protocols/oscar/libicq.c --- a/libpurple/protocols/oscar/libicq.c Thu Mar 11 02:48:12 2010 +0000 +++ b/libpurple/protocols/oscar/libicq.c Thu Mar 11 06:58:33 2010 +0000 @@ -41,8 +41,7 @@ OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE, NULL, /* user_splits */ NULL, /* protocol_options */ - {"gif,jpeg,bmp,ico", 48, 48, 52, 64, 7168, - PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ + {"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ oscar_list_icon_icq, /* list_icon */ oscar_list_emblem, /* list_emblems */ oscar_status_text, /* status_text */