Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 29113:3bf5dbff753b
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 | 9ae3e70a327b |
children | d558d141aaae |
comparison
equal
deleted
inserted
replaced
29112:3d471a4bafac | 29113:3bf5dbff753b |
---|---|
1114 } | 1114 } |
1115 } | 1115 } |
1116 | 1116 |
1117 if(cbdata->js->registration) { | 1117 if(cbdata->js->registration) { |
1118 username = g_strdup_printf("%s@%s%s%s", cbdata->js->user->node, cbdata->js->user->domain, | 1118 username = g_strdup_printf("%s@%s%s%s", cbdata->js->user->node, cbdata->js->user->domain, |
1119 cbdata->js->user->resource ? "/" : "", cbdata->js->user->resource); | 1119 cbdata->js->user->resource ? "/" : "", |
1120 cbdata->js->user->resource ? cbdata->js->user->resource : ""); | |
1120 purple_account_set_username(cbdata->js->gc->account, username); | 1121 purple_account_set_username(cbdata->js->gc->account, username); |
1121 g_free(username); | 1122 g_free(username); |
1122 } | 1123 } |
1123 | 1124 |
1124 jabber_iq_set_callback(iq, jabber_registration_result_cb, cbdata->who); | 1125 jabber_iq_set_callback(iq, jabber_registration_result_cb, cbdata->who); |