Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/commands.c @ 2353:73916eeef3cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix display when sending message to a full JID This path fixes a regression in mcabber 1.1.1. The message was shown as if it was a MUC private message. Thanks to Minoru for the report.
author franky
date Tue, 15 Sep 2020 21:31:00 +0200
parents 7921c8d671c8
children
comparison
equal deleted inserted replaced
2352:1d4274111c5d 2353:73916eeef3cb
1287 // Jump to window, create one if needed 1287 // Jump to window, create one if needed
1288 scr_roster_jump_jid(bare_jid); 1288 scr_roster_jump_jid(bare_jid);
1289 } 1289 }
1290 1290
1291 // Check if we're sending a message to a conference room 1291 // Check if we're sending a message to a conference room
1292 isroom = !!roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM); 1292 if (NULL != roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM)) {
1293 muc_nick = jid_get_resource_name(fjid); 1293 muc_nick = jid_get_resource_name(fjid);
1294 isroom = isroom && !muc_nick; 1294 isroom = !muc_nick; // if a resource is specified, then it's a muc private message, not a room
1295 } else {
1296 isroom = false;
1297 muc_nick = NULL;
1298 }
1295 1299
1296 // local part (UI, logging, etc.) 1300 // local part (UI, logging, etc.)
1297 if (subj) 1301 if (subj)
1298 hmsg = g_strdup_printf("[%s]\n%s", subj, msg); 1302 hmsg = g_strdup_printf("[%s]\n%s", subj, msg);
1299 else 1303 else