Mercurial > pidgin.yaz
changeset 6294:430693544643
[gaim-migrate @ 6793]
this should help out those who have NULL profiles on jabber. Thanks go to
Devin Bayer (mal0rd) for catching this.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Thu, 24 Jul 2003 05:27:29 +0000 |
| parents | 70f48f166aee |
| children | 44daf60ae44a |
| files | src/protocols/jabber/jabber.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c Thu Jul 24 04:55:32 2003 +0000 +++ b/src/protocols/jabber/jabber.c Thu Jul 24 05:27:29 2003 +0000 @@ -4020,17 +4020,17 @@ MultiEntryDlg *b = multi_entry_dialog_new(); char *cdata; xmlnode x_vc_data = NULL; - GaimAccount *tmp = gc->account; - b->account = tmp; + + b->account = gc->account; /* * Get existing, XML-formatted, user info */ - if((user_info = g_malloc(strlen(tmp->user_info) + 1)) != NULL) { - strcpy(user_info, tmp->user_info); + if((user_info = g_strdup(gaim_account_get_user_info(gc->account))) != NULL) x_vc_data = xmlstr2xmlnode(user_info); - } + else + user_info = g_strdup(""); /* * Set up GSLists for edit with labels from "template," data from user info @@ -4091,9 +4091,7 @@ } } - if(user_info != NULL) { - g_free(user_info); - } + g_free(user_info); b->title = _("Gaim - Edit Jabber vCard"); b->role = "set_info";