pidgin: ddd087b8: Current versions of ICQ will happily sca...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: ddd087b8db86e3e34df155ddd550686c7ba5982a
Ancestor: 352c91ba4490fea185cd62c4f0ad7fda9d48e60f
Author: markdoliner at pidgin.im
Date: 2010-03-11T06:58:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ddd087b8db86e3e34df155ddd550686c7ba5982a

Modified files:
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/libaim.c	a3b16dbc98e55f9b19909cb44defeb673f6b4db8
+++ libpurple/protocols/oscar/libaim.c	aaf891693df785ac5f727e3bbf2dab91da4e496e
@@ -31,7 +31,6 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */
============================================================
--- libpurple/protocols/oscar/libicq.c	67eca9fcfecbf6204cc3e04bb5ad7fd69578da31
+++ libpurple/protocols/oscar/libicq.c	c142e88d51d0c17682b5574d807aa604f332c391
@@ -41,8 +41,7 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */