Mercurial > pidgin

changeset 28731:3bf5dbff753b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jabber: Complete the fix for a NULL printf() on registration on Windows. Closes #10420 again. Man, do I hate these NULL printf() bugs.
author Paul Aurich <paul@darkrain42.org>
date Tue, 01 Dec 2009 21:18:45 +0000
parents 3d471a4bafac
children 1bb466ce21b8
files libpurple/protocols/jabber/jabber.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Tue Dec 01 16:49:15 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue Dec 01 21:18:45 2009 +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);
 	}