changeset 29349:3de19f8f5c92

merge of '57bf84117d335fd0bba1edff4c5b3b21e29f6bbc' and '681fb86466372d3d72fbfb554c0b766c81d763e6'

--- a/ChangeLog	Wed Feb 03 22:46:22 2010 +0000
+++ b/ChangeLog	Wed Feb 03 22:48:03 2010 +0000
@@ -16,6 +16,10 @@
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
 
+	AIM:
+	* Allow setting and displaying icons between 1x1 and 100x100 pixels.
+	  Previously only icons between 48x48 and 50x50 were allowed.
+
 	MSN:
 	* File transfer requests will no longer cause a crash if you delete the
 	  file before the other side accepts.
@@ -36,8 +40,8 @@
 	* Don't do an SRV lookup for a STUN server associated with the account
 	  if one is already set globally in prefs.
 	* Don't send custom smileys larger than the recommended maximum object size
-	  specified in the BoB XEP. Will prevent getting disconnected because of
-	  sending to large stanzas.
+	  specified in the BoB XEP.   This prevents a client from being
+	  disconnected by servers that dislike overly-large stanzas.
 
 	Yahoo:
 	* Don't send <span> and </span> tags.  (Fartash Faghri)

--- a/libpurple/protocols/jabber/message.c	Wed Feb 03 22:46:22 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Wed Feb 03 22:48:03 2010 +0000
@@ -1013,6 +1013,10 @@
 					valid_smileys = g_list_append(valid_smileys, smiley);
 				} else {
 					has_too_large_smiley = TRUE;
+					purple_debug_warning("jabber", "Refusing to send smiley %s "
+							"(too large, max is %d)\n",
+							purple_smiley_get_shortcut(smiley),
+							JABBER_DATA_MAX_SIZE);
 				}				
 			}
 

--- a/libpurple/protocols/msn/contact.c	Wed Feb 03 22:46:22 2010 +0000
+++ b/libpurple/protocols/msn/contact.c	Wed Feb 03 22:48:03 2010 +0000
@@ -406,8 +406,8 @@
 	msn_user_set_network(user, nid);
 	msn_user_set_invite_message(user, invite);
 
-	if (member_id) {
-		user->membership_id[list] = atoi(member_id);
+	if (list == MSN_LIST_PL && member_id) {
+		user->member_id_on_pending_list = atoi(member_id);
 	}
 
 	msn_got_lst_user(session, user, 1 << list, NULL);
@@ -1567,11 +1567,11 @@
 		if (user && user->networkid != MSN_NETWORK_PASSPORT)
 			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
 			                         "EmailMember", "Email",
-			                         user->membership_id[MSN_LIST_PL]);
+			                         user->member_id_on_pending_list);
 		else
 			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
 			                         "PassportMember", "Passport",
-			                         user->membership_id[MSN_LIST_PL]);
+			                         user->member_id_on_pending_list);
 	} else {
 		/* list == MSN_LIST_AL || list == MSN_LIST_BL */
 		partner_scenario = MSN_PS_BLOCK_UNBLOCK;

--- a/libpurple/protocols/msn/user.h	Wed Feb 03 22:46:22 2010 +0000
+++ b/libpurple/protocols/msn/user.h	Wed Feb 03 22:48:03 2010 +0000
@@ -103,8 +103,11 @@
 
 	int list_op;            /**< Which lists the user is in     */
 
-	guint membership_id[5];	/**< The membershipId sent by the contacts server,
-				     indexed by the list it belongs to		*/
+	/**
+	 * The membershipId for this buddy on our pending list.  Sent by
+	 * the contact's server
+	 */
+	guint member_id_on_pending_list;
 
 	char *invite_message;   /**< Invite message of user request */
 };

--- a/libpurple/protocols/msn/userlist.c	Wed Feb 03 22:46:22 2010 +0000
+++ b/libpurple/protocols/msn/userlist.c	Wed Feb 03 22:48:03 2010 +0000
@@ -119,26 +119,16 @@
 	if (group_id == NULL)
 		return FALSE;
 
-	if (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp))
-		return TRUE;
-
-	return FALSE;
+	return (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp)) != NULL;
 }
 
 gboolean
 msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
 {
-	int list_op;
-
 	if (user == NULL)
 		return FALSE;
 
-	list_op = 1 << list_id;
-
-	if (user->list_op & list_op)
-		return TRUE;
-	else
-		return FALSE;
+	return (user->list_op & (1 << list_id));
 }
 
 /**************************************************************************

--- a/libpurple/protocols/msn/userlist.h	Wed Feb 03 22:46:22 2010 +0000
+++ b/libpurple/protocols/msn/userlist.h	Wed Feb 03 22:48:03 2010 +0000
@@ -31,12 +31,11 @@
 
 typedef enum
 {
-	MSN_LIST_FL,
-	MSN_LIST_AL,
-	MSN_LIST_BL,
-	MSN_LIST_RL,
-	MSN_LIST_PL
-
+	MSN_LIST_FL, /**< Forward list */
+	MSN_LIST_AL, /**< Allow list */
+	MSN_LIST_BL, /**< Block list */
+	MSN_LIST_RL, /**< Reverse list */
+	MSN_LIST_PL  /**< Pending list */
 } MsnListId;