diff options
| author | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
|---|---|---|
| committer | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
| commit | 5571d277b93b62c73568b78c652c85b2e8e95183 (patch) | |
| tree | 0d97d65058e31ccdeab4006384442a8e378d5f06 /src/common/userlist.c | |
| parent | f58165fd33919951e2ca594c6f19a785420fc4f9 (diff) | |
| parent | 7f8b0a19cff46f7d27451fb9942eea5018f0c5b5 (diff) | |
Merge upstream changes
Diffstat (limited to 'src/common/userlist.c')
| -rw-r--r-- | src/common/userlist.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/common/userlist.c b/src/common/userlist.c index 0f28a000..5f2d67f2 100644 --- a/src/common/userlist.c +++ b/src/common/userlist.c @@ -101,13 +101,15 @@ userlist_set_account (struct session *sess, char *nick, char *account) user = userlist_find (sess, nick); if (user) { - g_free (user->account); - if (strcmp (account, "*") == 0) - user->account = NULL; - else + { + g_clear_pointer (&user->account, g_free); + } else if (g_strcmp0 (user->account, account)) + { + g_free (user->account); user->account = g_strdup (account); - + } + /* gui doesnt currently reflect login status, maybe later fe_userlist_rehash (sess, user); */ } @@ -130,8 +132,11 @@ userlist_add_hostname (struct session *sess, char *nick, char *hostname, g_free (user->hostname); user->hostname = g_strdup (hostname); } - if (!user->realname && realname && *realname) + if (realname && *realname && g_strcmp0 (user->realname, realname) != 0) + { + g_free (user->realname); user->realname = g_strdup (realname); + } if (!user->servername && servername) user->servername = g_strdup (servername); if (!user->account && account && strcmp (account, "0") != 0) |