pidgin: c69bc8e8: jabber: Set a connection display name ev...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: c69bc8e83c4645b4d8a7a4fefcc17d822d988de3
Parent:   3050f924f866a46308138a85e428a61121b2cbc9
Author:   darkrain42 at pidgin.im
Date:     10/10/10 12:42:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c69bc8e83c4645b4d8a7a4fefcc17d822d988de3

Changelog: 

jabber: Set a connection display name even when using legacy auth

Previously, the only place we were setting one was in the bind-result
code path, so it was always NULL when doing legacy auth, but that
causes issues with jabber_presence_fake_to_self, so let's just have
a default init in jabber_stream_new().  Should Fixes #12499

Changes against parent 3050f924f866a46308138a85e428a61121b2cbc9

  patched  ChangeLog
  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- ChangeLog	04364b9c71e353119a0bf95f4a2abb35dd2325c6
+++ ChangeLog	56da7f0e3fed2885034a60a5e751cf9a4f9f57a8
@@ -58,6 +58,8 @@ version 2.7.4 (MM/DD/YYYY):
 	  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
============================================================
--- libpurple/protocols/jabber/jabber.c	e0dab72842b6dd6dfb079b0b9ba4d0bfcfd23988
+++ libpurple/protocols/jabber/jabber.c	860ec35a972760253c78446914280947d58716f1
@@ -968,6 +968,11 @@ jabber_stream_new(PurpleAccount *account
 	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) {