pidgin: aad06bbf: Fix setting icons with dimensions greate...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: aad06bbf6f9a5e7fd1f16c72be4af2060e8de4c3
Parent:   7835e0863cb2185ab127769ebed15541164cd1dd
Author:   markdoliner at pidgin.im
Date:     05/11/11 05:29:47
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aad06bbf6f9a5e7fd1f16c72be4af2060e8de4c3

Changelog: 

Fix setting icons with dimensions greater than 64x64 pixels by scaling
them down to at most 64x64. (#12874, #13165)

Changes against parent 7835e0863cb2185ab127769ebed15541164cd1dd

  patched  ChangeLog
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c

-------------- next part --------------
============================================================
--- ChangeLog	2bc2722bc0a0ae576a70a4b3b9e791818b8e5684
+++ ChangeLog	9a3cd37a40d198edba991991ae0a4b448482f89c
@@ -39,6 +39,10 @@ version 2.8.0 (??/??/????):
 	  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 @@ version 2.8.0 (??/??/????):
 	  (#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
============================================================
--- libpurple/protocols/oscar/libaim.c	a64b5eca261a904a5ecc60290abcaec53a3432f3
+++ libpurple/protocols/oscar/libaim.c	d64c47ca2ca9f18c114b3dfe3a40b49b4057dc4b
@@ -32,7 +32,7 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */
============================================================
--- libpurple/protocols/oscar/libicq.c	1cee78d9aad16734383b5c0b7511c58bd67026b5
+++ libpurple/protocols/oscar/libicq.c	b4abfbb97f9246553ab7160c9b4e32f77695c312
@@ -41,7 +41,7 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */