pidgin: 77aade6c: Recently I found out a small issue: if a...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 77aade6c632bdc5aabf76708fca466ad03d0b517
Parent:   5087ae3da67c78c371451923ff256caacaac370d
Author:   tomkiewicz at o2.pl
Date:     04/16/11 11:35:53
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/77aade6c632bdc5aabf76708fca466ad03d0b517

Changelog: 

Recently I found out a small issue: if another user changes it's avatar, we
don't get it updated. New avatar is visible after our reconnect, or after this
other user status change.

I found out, that we get these updates in XML event packet, but we don't handle
them. XML events can contain:
 - GGLive messages (I think, it's something like tweeter service)
 - notifications about avatar changes
 - notifications about user's new blog entries
 - graphical statuses (I hope we will NOT support this one)

Detailed information (in Polish): http://toxygen.net/libgadu/protocol/#ch1.13

I have implemented general support for XML events, so we could provide support
for new !GaduGadu features in the future. Also, I have fixed that small issue,
by implementing avatar change notifications, provided by these events.

Changes against parent 5087ae3da67c78c371451923ff256caacaac370d

  patched  libpurple/protocols/gg/gg.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/gg.c	21e55c4e392a86665ec7dbf9406f903da27315ba
+++ libpurple/protocols/gg/gg.c	a53140027d029f1ca15f7628ce608e8dcd00eb6d
@@ -1044,31 +1044,46 @@ out:
 }
 
 /**
- * Handle change of the status of the buddy.
+ * Try to update avatar of the buddy.
  *
  * @param gc     PurpleConnection
  * @param uin    UIN of the buddy.
- * @param status ID of the status.
- * @param descr  Description.
  */
-static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
-				       int status, const char *descr)
+static void ggp_update_buddy_avatar(PurpleConnection *gc, uin_t uin)
 {
-	gchar *from;
-	const char *st;
 	gchar *avatarurl;
 	PurpleUtilFetchUrlData *url_data;
 
-	from = g_strdup_printf("%u", uin);
-	avatarurl = g_strdup_printf("http://api.gadu-gadu.pl/avatars/%s/0.xml", from);
+	purple_debug_info("gg", "ggp_update_buddy_avatar(gc, %u)\n", uin);
 
+	avatarurl = g_strdup_printf("http://api.gadu-gadu.pl/avatars/%u/0.xml", uin);
+
 	url_data = purple_util_fetch_url_request_len_with_account(
 			purple_connection_get_account(gc), avatarurl, TRUE,
 			"Mozilla/4.0 (compatible; MSIE 5.5)", FALSE, NULL, FALSE, -1,
 			gg_get_avatar_url_cb, gc);
 
 	g_free(avatarurl);
+}
 
+/**
+ * Handle change of the status of the buddy.
+ *
+ * @param gc     PurpleConnection
+ * @param uin    UIN of the buddy.
+ * @param status ID of the status.
+ * @param descr  Description.
+ */
+static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
+				       int status, const char *descr)
+{
+	gchar *from;
+	const char *st;
+
+	ggp_update_buddy_avatar(gc, uin);
+
+	from = g_strdup_printf("%u", uin);
+
 	switch (status) {
 		case GG_STATUS_NOT_AVAIL:
 		case GG_STATUS_NOT_AVAIL_DESCR:
@@ -1614,6 +1629,75 @@ static void ggp_typing_notification_hand
     g_free(from);
 }
 
+/**
+ * Handling of XML events.
+ *
+ * @param gc PurpleConnection.
+ * @param data Raw XML contents.
+ *
+ * @see http://toxygen.net/libgadu/protocol/#ch1.13
+ */
+static void ggp_xml_event_handler(PurpleConnection *gc, char *data)
+{
+	xmlnode *xml = NULL;
+	xmlnode *xmlnode_next_event;
+
+	xml = xmlnode_from_str(data, -1);
+	if (xml == NULL)
+		goto out;
+
+	xmlnode_next_event = xmlnode_get_child(xml, "event");
+	while (xmlnode_next_event != NULL)
+	{
+		xmlnode *xmlnode_current_event = xmlnode_next_event;
+		
+		xmlnode *xmlnode_type;
+		char *event_type_raw;
+		int event_type = 0;
+		
+		xmlnode *xmlnode_sender;
+		char *event_sender_raw;
+		uin_t event_sender = 0;
+
+		xmlnode_next_event = xmlnode_get_next_twin(xmlnode_next_event);
+		
+		xmlnode_type = xmlnode_get_child(xmlnode_current_event, "type");
+		if (xmlnode_type == NULL)
+			continue;
+		event_type_raw = xmlnode_get_data(xmlnode_type);
+		if (event_type_raw != NULL)
+			event_type = atoi(event_type_raw);
+		g_free(event_type_raw);
+		
+		xmlnode_sender = xmlnode_get_child(xmlnode_current_event, "sender");
+		if (xmlnode_sender != NULL)
+		{
+			event_sender_raw = xmlnode_get_data(xmlnode_sender);
+			if (event_sender_raw != NULL)
+				event_sender = ggp_str_to_uin(event_sender_raw);
+			g_free(event_sender_raw);
+		}
+		
+		switch (event_type)
+		{
+			case 28: /* avatar update */
+				purple_debug_info("gg",
+					"ggp_xml_event_handler: avatar updated (uid: %u)\n",
+					event_sender);
+				ggp_update_buddy_avatar(gc, event_sender);
+				break;
+			default:
+				purple_debug_error("gg",
+					"ggp_xml_event_handler: unsupported event type=%d from=%u\n",
+					event_type, event_sender);
+		}
+	}
+	
+	out:
+		if (xml)
+			xmlnode_free(xml);
+}
+
 static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 {
 	PurpleConnection *gc = _gc;
@@ -1731,6 +1815,10 @@ static void ggp_callback_recv(gpointer _
 			ggp_typing_notification_handler(gc, ev->event.typing_notification.uin,
 				ev->event.typing_notification.length);
 			break;
+		case GG_EVENT_XML_EVENT:
+			purple_debug_info("gg", "GG_EVENT_XML_EVENT\n");
+			ggp_xml_event_handler(gc, ev->event.xml_event.data);
+			break;
 		default:
 			purple_debug_error("gg",
 				"unsupported event type=%d\n", ev->type);