Mercurial > pidgin
changeset 30598:58c919deda6c
merge of '0ff371dbf457757cf975dd2588f1a858f3d3d09a'
and 'c69bc8e83c4645b4d8a7a4fefcc17d822d988de3'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 10 Oct 2010 16:43:30 +0000 |
| parents | c5bbd8a2760d (current diff) adce8f13a749 (diff) |
| children | 0950887d7860 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 10 10:41:37 2010 +0000 +++ b/ChangeLog Sun Oct 10 16:43:30 2010 +0000 @@ -58,6 +58,8 @@ is "gmail.com" or "googlemail.com" (it's also needed for Google Talk used for accounts on arbitrary domains not using Google Apps for Your Domain). (#a14153) + * Improved handling of adding oneself to your buddy list when using + Non-SASL (legacy) authentication. (#12499) Yahoo/Yahoo JAPAN: * Stop doing unnecessary lookups of certain alias information. This
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 10 10:41:37 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Oct 10 16:43:30 2010 +0000 @@ -968,6 +968,11 @@ js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_buddy_free); + /* This is overridden during binding, but we need it here + * in case the server only does legacy non-sasl auth!. + */ + purple_connection_set_display_name(gc, user); + js->user_jb = jabber_buddy_find(js, user, TRUE); g_free(user); if (!js->user_jb) {