pidgin.2.6.5: 62696a0f: *** Plucked rev 941f01ed2234f8e476b7260f...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 62696a0f1033a2fe18ac60e4fc617d727ab86de8
Ancestor: 64937fa364b24dccc5006d84e81c9f3db5a31dd7
Author: datallah at pidgin.im
Date: 2010-01-07T23:41:17
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/62696a0f1033a2fe18ac60e4fc617d727ab86de8

Modified files:
        ChangeLog libpurple/protocols/jabber/jabber.c

ChangeLog: 

*** Plucked rev 941f01ed2234f8e476b7260fbd6ea873583387f7 (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
jabber: Complete the fix for a NULL printf() on registration on Windows.  Closes #10420 again.

Man, do I hate these NULL printf() bugs.

*** Plucked rev 1cebb8e5585732c30dcfb31a6700dcb78ae47b44 (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
Changelog that.


-------------- next part --------------
============================================================
--- ChangeLog	d147b5e153f1509bf10d17a3373874022aa593bb
+++ ChangeLog	ca55db6f2d2ca001f02f4b4cab45cede37bdf8bc
@@ -1,6 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM
 
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.5 (??/??/20??):
+	XMPP:
+	* Do not crash when attempting to register for a new account on Windows.
+
 version 2.6.4 (11/29/2009):
 	libpurple:
 	* Actually emit the hold signal for media calls.
============================================================
--- libpurple/protocols/jabber/jabber.c	739a0e2460a56e90818d6e6156ea37fa9d5fdde5
+++ libpurple/protocols/jabber/jabber.c	f6844127d069119d3032bf961c16be325e4cddc7
@@ -1116,7 +1116,8 @@ jabber_register_cb(JabberRegisterCBData 
 
 	if(cbdata->js->registration) {
 		username = g_strdup_printf("%s@%s%s%s", cbdata->js->user->node, cbdata->js->user->domain,
-			cbdata->js->user->resource ? "/" : "", cbdata->js->user->resource);
+			cbdata->js->user->resource ? "/" : "",
+			cbdata->js->user->resource ? cbdata->js->user->resource : "");
 		purple_account_set_username(cbdata->js->gc->account, username);
 		g_free(username);
 	}