Mercurial > pidgin.yaz
changeset 29979:bddc2c8e8b98
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.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 11 Mar 2010 06:58:33 +0000 |
| parents | 8b9359833987 |
| children | e69d8f6ca054 |
| files | libpurple/protocols/oscar/libaim.c libpurple/protocols/oscar/libicq.c |
| diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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 */