/pidgin/main: db3a62c8006c: Gadu-Gadu: disable avatars support f...

Tomasz Wasilczyk tomkiewicz at cpw.pidgin.im
Sat Jul 28 13:34:26 EDT 2012


Changeset: db3a62c8006c0de5b02200b0f26568ba8c814c20
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-07-28 19:34 +0200
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/db3a62c8006c

Description:

Gadu-Gadu: disable avatars support for buddies. Fixes #15226

diffstat:

 ChangeLog                   |   4 ++++
 libpurple/protocols/gg/gg.c |  11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diffs (63 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ version 2.10.7:
 	Alien hatchery:
 	* No changes
 
+	Gadu-Gadu:
+	* Fix a crash at startup with large contact list. Avatar support for
+	  buddies will be disabled till 3.0.0. (#15226, #14305)
+
 	MSN:
 	* Fix a crash when removing a user before its icon is loaded. (Mark
 	  Barfield) (#15217)
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -47,6 +47,8 @@
 #include "buddylist.h"
 #include "gg-utils.h"
 
+#define DISABLE_AVATARS 1
+
 static PurplePlugin *my_protocol = NULL;
 
 /* Prototypes */
@@ -903,6 +905,8 @@ static void ggp_rem_deny(PurpleConnectio
 /* ----- INTERNAL CALLBACKS --------------------------------------------- */
 /* ---------------------------------------------------------------------- */
 
+#if !DISABLE_AVATARS
+
 struct gg_fetch_avatar_data
 {
 	PurpleConnection *gc;
@@ -1037,6 +1041,8 @@ out:
 	g_free(bigavatar);
 }
 
+#endif
+
 /**
  * Try to update avatar of the buddy.
  *
@@ -1045,6 +1051,10 @@ out:
  */
 static void ggp_update_buddy_avatar(PurpleConnection *gc, uin_t uin)
 {
+#if DISABLE_AVATARS
+	purple_debug_warning("gg", "ggp_update_buddy_avatar: disabled, please "
+		"update to 3.0.0, when available\n");
+#else
 	gchar *avatarurl;
 	PurpleUtilFetchUrlData *url_data;
 
@@ -1058,6 +1068,7 @@ static void ggp_update_buddy_avatar(Purp
 			gg_get_avatar_url_cb, gc);
 
 	g_free(avatarurl);
+#endif
 }
 
 /**



More information about the Commits mailing list