Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp_muc.c @ 2006:fa6694a193ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add configuration setting for previous commit
author Hermitifier
date Thu, 09 Feb 2012 14:21:36 +0100
parents e0aedfa091ec
children 33483d3324cf
comparison
equal deleted inserted replaced
2005:e0aedfa091ec 2006:fa6694a193ec
355 { 355 {
356 bool new_member = FALSE; // True if somebody else joins the room (not us) 356 bool new_member = FALSE; // True if somebody else joins the room (not us)
357 gchar *nickjid; 357 gchar *nickjid;
358 gchar *mbuf; 358 gchar *mbuf;
359 enum room_flagjoins flagjoins; 359 enum room_flagjoins flagjoins;
360 360 char *tmp = NULL;
361 if (mbjid && autowhois == autowhois_off) 361 int printjid;
362
363 printjid = settings_opt_get_int("muc_print_jid");
364 if (mbjid && autowhois == autowhois_off && printjid) {
365 if (printjid == 1)
366 tmp = strchr(mbjid, JID_RESOURCE_SEPARATOR);
367 if (tmp) *tmp = '\0';
362 nickjid = g_strdup_printf("%s <%s>", rname, mbjid); 368 nickjid = g_strdup_printf("%s <%s>", rname, mbjid);
363 else 369 if (tmp) *tmp = JID_RESOURCE_SEPARATOR;
370 } else {
364 nickjid = g_strdup(rname); 371 nickjid = g_strdup(rname);
372 }
365 373
366 if (!buddy_getinsideroom(room_elt->data)) { 374 if (!buddy_getinsideroom(room_elt->data)) {
367 // We weren't inside the room yet. Now we are. 375 // We weren't inside the room yet. Now we are.
368 // However, this could be a presence packet from another room member 376 // However, this could be a presence packet from another room member
369 377