# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1305106187 0
# Node ID bfb4b66953b4330f3d44b8b0af63a305a3872d6d
# Parent  7ad1f8242ae8e073edb01b4fdf836db5ecde2cfb
Fix setting icons with dimensions greater than 64x64 pixels by scaling
them down to at most 64x64. (#12874, #13165)

diff -r 7ad1f8242ae8 -r bfb4b66953b4 ChangeLog
--- a/ChangeLog	Wed May 11 07:50:55 2011 +0000
+++ b/ChangeLog	Wed May 11 09:29:47 2011 +0000
@@ -39,6 +39,10 @@
 	  restrict operations that could leak potentially sensitive data
 	  (e.g. DNS queries).  (#11110, #13928)
 
+	AIM:
+	* Fix setting icons with dimensions greater than 64x64 pixels by scaling
+	  them down to at most 64x64. (#12874, #13165)
+
 	Gadu-Gadu:
 	* Allow showing your status only to buddies. (Mateusz Piękos) (#13358)
 	* Updated internal libgadu to version 1.10.1. (Robert Matusewicz,
@@ -64,6 +68,8 @@
 	  (#13886)
 
 	ICQ:
+	* Fix setting icons with dimensions greater than 64x64 pixels by scaling
+	  them down to at most 64x64. (#12874, #13165)
 	* Fix unsetting your mood when "None" is selected.  (Dustin Gathmann)
 	  (#11895)
 	* Ignore Daylight Saving Time when performing calculations related to
diff -r 7ad1f8242ae8 -r bfb4b66953b4 libpurple/protocols/oscar/libaim.c
--- a/libpurple/protocols/oscar/libaim.c	Wed May 11 07:50:55 2011 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Wed May 11 09:29:47 2011 +0000
@@ -32,7 +32,7 @@
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE | OPT_PROTO_INVITE_MESSAGE,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	{"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
+	{"gif,jpeg,bmp,ico", 0, 0, 64, 64, 7168, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
 	oscar_list_icon_aim,		/* list_icon */
 	oscar_list_emblem,		/* list_emblems */
 	oscar_status_text,		/* status_text */
diff -r 7ad1f8242ae8 -r bfb4b66953b4 libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c	Wed May 11 07:50:55 2011 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Wed May 11 09:29:47 2011 +0000
@@ -41,7 +41,7 @@
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE | OPT_PROTO_INVITE_MESSAGE,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	{"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
+	{"gif,jpeg,bmp,ico", 0, 0, 64, 64, 7168, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
 	oscar_list_icon_icq,		/* list_icon */
 	oscar_list_emblem,		/* list_emblems */
 	oscar_status_text,		/* status_text */