Mercurial > ~mikael > mcabber > hg

diff mcabber/mcabber/xmpp_muc.c @ 2346:7921c8d671c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implemented another helper function jid_get_resource_name
author franky
date Tue, 14 May 2019 22:19:33 +0200
parents ffd0e57e9563
children db8de1b464d3
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp_muc.c	Sat May 11 23:06:34 2019 +0200
+++ b/mcabber/mcabber/xmpp_muc.c	Tue May 14 22:19:33 2019 +0200
@@ -375,11 +375,12 @@
 
   printjid = settings_opt_get_int("muc_print_jid");
   if (mbjid && autowhois == autowhois_off && printjid) {
-    if (printjid == 1)
-      tmp = strchr(mbjid, JID_RESOURCE_SEPARATOR);
-    if (tmp) *tmp = '\0';
-    nickjid = g_strdup_printf("%s <%s>", rname, mbjid);
-    if (tmp) *tmp = JID_RESOURCE_SEPARATOR;
+    if (printjid == 1) // print nick + barejid
+      tmp = jidtodisp(mbjid);
+    if (printjid == 2) // print nick + full jid
+      tmp = g_strdup(mbjid);
+    nickjid = g_strdup_printf("%s <%s>", rname, tmp);
+    g_free(tmp);
   } else {
     nickjid = g_strdup(rname);
   }