# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1250393276 0
# Node ID df920ad8cf4f9030a407dcaa919c002291270ce1
# Parent  3b6f50b68f5d2ddc81b88dd7be31bd487fd7ae2d# Parent  6b05a0e36ffbbb772a0819703fed1512621b6417
merge of '21745356545795bcec9c44cff0e779429c5092c6'
     and '39fc4acd81cf1796220d3ed4fff0b17bc5acf6de'

diff -r 3b6f50b68f5d -r df920ad8cf4f pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sun Aug 16 03:22:58 2009 +0000
+++ b/pidgin/gtkblist.c	Sun Aug 16 03:27:56 2009 +0000
@@ -622,7 +622,14 @@
 				struct _pidgin_blist_node *gtknode =
 					(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
 
-				if (purple_contact_get_alias(contact) || gtknode->contact_expanded) {
+				/*
+				 * XXX Using purple_contact_get_alias here breaks because we
+				 * specifically want to check the contact alias only (i.e. not
+				 * the priority buddy, which purple_contact_get_alias does).
+				 * Adding yet another get_alias is evil, so figure this out
+				 * later :-P
+				 */
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
 					gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
 				} else {
diff -r 3b6f50b68f5d -r df920ad8cf4f pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c	Sun Aug 16 03:22:58 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Sun Aug 16 03:27:56 2009 +0000
@@ -144,12 +144,12 @@
 tls_peers_mgmt_import_ok2_cb(gpointer data, const char *result)
 {
 	PurpleCertificate *crt = (PurpleCertificate *) data;
-	const char *id = result;
 
 	/* TODO: Perhaps prompt if you're overwriting a cert? */
 
 	/* Drop the certificate into the pool */
-	purple_certificate_pool_store(tpm_dat->tls_peers, id, crt);
+	if (result && *result)
+		purple_certificate_pool_store(tpm_dat->tls_peers, result, crt);
 
 	/* And this certificate is not needed any more */
 	purple_certificate_destroy(crt);