comparison mcabber/src/jabglue.c @ 1342:06441b6cc23a

History logfile: Use a special code (MI) for local MUC info messages (Suggested by bb)
author Mikael Berthe <mikael@lilotux.net>
date Sat, 03 Nov 2007 16:52:25 +0100
parents e30a9d907105
children 8a05feb23c5a
comparison
equal deleted inserted replaced
1341:305f7a609545 1342:06441b6cc23a
2050 if (statuscode == 303 && mbnick) { 2050 if (statuscode == 303 && mbnick) {
2051 mbuf = g_strdup_printf("%s is now known as %s", rname, mbnick); 2051 mbuf = g_strdup_printf("%s is now known as %s", rname, mbnick);
2052 scr_WriteIncomingMessage(roomjid, mbuf, usttime, 2052 scr_WriteIncomingMessage(roomjid, mbuf, usttime,
2053 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0); 2053 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
2054 if (log_muc_conf) 2054 if (log_muc_conf)
2055 hlog_write_message(roomjid, 0, FALSE, mbuf); 2055 hlog_write_message(roomjid, 0, -1, mbuf);
2056 g_free(mbuf); 2056 g_free(mbuf);
2057 buddy_resource_setname(room_elt->data, rname, mbnick); 2057 buddy_resource_setname(room_elt->data, rname, mbnick);
2058 // Maybe it's _our_ nickname... 2058 // Maybe it's _our_ nickname...
2059 if (ournick && !strcmp(rname, ournick)) 2059 if (ournick && !strcmp(rname, ournick))
2060 buddy_setnickname(room_elt->data, mbnick); 2060 buddy_setnickname(room_elt->data, mbnick);
2136 msgflags |= HBB_PREFIX_NOFLAG; 2136 msgflags |= HBB_PREFIX_NOFLAG;
2137 2137
2138 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0); 2138 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
2139 2139
2140 if (log_muc_conf) 2140 if (log_muc_conf)
2141 hlog_write_message(roomjid, 0, FALSE, mbuf); 2141 hlog_write_message(roomjid, 0, -1, mbuf);
2142 2142
2143 if (we_left) { 2143 if (we_left) {
2144 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf); 2144 scr_LogPrint(LPRINT_LOGNORM, "%s", mbuf);
2145 g_free(mbuf); 2145 g_free(mbuf);
2146 return; 2146 return;
2168 // Note: the usttime timestamp is related to the other member, 2168 // Note: the usttime timestamp is related to the other member,
2169 // so we use 0 here. 2169 // so we use 0 here.
2170 scr_WriteIncomingMessage(roomjid, mbuf, 0, 2170 scr_WriteIncomingMessage(roomjid, mbuf, 0,
2171 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0); 2171 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
2172 if (log_muc_conf) 2172 if (log_muc_conf)
2173 hlog_write_message(roomjid, 0, FALSE, mbuf); 2173 hlog_write_message(roomjid, 0, -1, mbuf);
2174 g_free(mbuf); 2174 g_free(mbuf);
2175 mbuf = g_strdup_printf("%s has joined", rname); 2175 mbuf = g_strdup_printf("%s has joined", rname);
2176 new_member = TRUE; 2176 new_member = TRUE;
2177 } 2177 }
2178 } else { 2178 } else {
2187 msgflags = HBB_PREFIX_INFO; 2187 msgflags = HBB_PREFIX_INFO;
2188 if (!settings_opt_get_int("muc_flag_joins")) 2188 if (!settings_opt_get_int("muc_flag_joins"))
2189 msgflags |= HBB_PREFIX_NOFLAG; 2189 msgflags |= HBB_PREFIX_NOFLAG;
2190 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0); 2190 scr_WriteIncomingMessage(roomjid, mbuf, usttime, msgflags, 0);
2191 if (log_muc_conf) 2191 if (log_muc_conf)
2192 hlog_write_message(roomjid, 0, FALSE, mbuf); 2192 hlog_write_message(roomjid, 0, -1, mbuf);
2193 g_free(mbuf); 2193 g_free(mbuf);
2194 } 2194 }
2195 } 2195 }
2196 2196
2197 // Update room member status 2197 // Update room member status
2411 mbuf = g_strdup_printf("%s has set the topic to: %s", r, subj); 2411 mbuf = g_strdup_printf("%s has set the topic to: %s", r, subj);
2412 } 2412 }
2413 scr_WriteIncomingMessage(s, mbuf, 0, 2413 scr_WriteIncomingMessage(s, mbuf, 0,
2414 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0); 2414 HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG, 0);
2415 if (settings_opt_get_int("log_muc_conf")) 2415 if (settings_opt_get_int("log_muc_conf"))
2416 hlog_write_message(s, 0, FALSE, mbuf); 2416 hlog_write_message(s, 0, -1, mbuf);
2417 g_free(s); 2417 g_free(s);
2418 g_free(mbuf); 2418 g_free(mbuf);
2419 // The topic is displayed in the chat status line, so refresh now. 2419 // The topic is displayed in the chat status line, so refresh now.
2420 scr_UpdateChatStatus(TRUE); 2420 scr_UpdateChatStatus(TRUE);
2421 } else { // Chat message 2421 } else { // Chat message