gobjectification: ee8168f0: Apply some changes in files that were sp...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: ee8168f07a41fb037f978532fd6262ae9b6c605d
Parent:   6112405a3e13fbc1bb1daf7b60432cbc88cd87be
Author:   qulogic at pidgin.im
Date:     05/11/11 00:43:26
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/ee8168f07a41fb037f978532fd6262ae9b6c605d

Changelog: 

Apply some changes in files that were split out of their counterparts
from i.p.p.

Changes against parent 6112405a3e13fbc1bb1daf7b60432cbc88cd87be

  patched  libpurple/accountlist.c
  patched  libpurple/buddy.c

-------------- next part --------------
============================================================
--- libpurple/accountlist.c	e4549ca6ae9c12e845863ab8c47f21adfe528803
+++ libpurple/accountlist.c	abea805b4e3ce0f23fb9116be03356c37914c5de
@@ -340,6 +340,8 @@ parse_proxy_info(xmlnode *node, PurpleAc
 			purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS4);
 		else if (!strcmp(data, "socks5"))
 			purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS5);
+		else if (purple_strequal(data, "tor"))
+			purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_TOR);
 		else if (!strcmp(data, "envvar"))
 			purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_ENVVAR);
 		else
============================================================
--- libpurple/buddy.c	93f362ccef6d3553973e141ecafa2bbab62a31a6
+++ libpurple/buddy.c	02f4b3a886ef3399a4ca31bb1104d0d2aae389e7
@@ -26,6 +26,7 @@
 #include "accountlist.h"
 #include "dbus-maybe.h"
 #include "debug.h"
+#include "pounce.h"
 #include "server.h"
 #include "signals.h"
 #include "util.h"
@@ -560,6 +561,9 @@ purple_buddy_finalize(GObject *object)
 			prpl_info->buddy_free(buddy);
 	}
 
+	/* Remove this buddy's pounces */
+	purple_pounce_destroy_all_by_buddy(buddy);
+
 	/* Delete the node */
 	purple_buddy_icon_unref(priv->icon);
 	purple_presence_destroy(priv->presence);