Mercurial > pidgin
changeset 27923:df920ad8cf4f
merge of '21745356545795bcec9c44cff0e779429c5092c6'
and '39fc4acd81cf1796220d3ed4fff0b17bc5acf6de'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 16 Aug 2009 03:27:56 +0000 |
| parents | 3b6f50b68f5d (current diff) 6b05a0e36ffb (diff) |
| children | ce50e961f650 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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);