# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1262907677 0
# Node ID 214357c854187d63e78f2049669784dafc51a8b6
# Parent  1be982612d9af658c8450acc554baf6725160274
*** 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.

diff -r 1be982612d9a -r 214357c85418 ChangeLog
--- a/ChangeLog	Thu Jan 07 23:38:42 2010 +0000
+++ b/ChangeLog	Thu Jan 07 23:41:17 2010 +0000
@@ -1,6 +1,10 @@
 
 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.
diff -r 1be982612d9a -r 214357c85418 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Thu Jan 07 23:38:42 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Thu Jan 07 23:41:17 2010 +0000
@@ -1116,7 +1116,8 @@
 
 	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);
 	}