--- a/mcabber/src/hooks.c Thu Mar 27 23:27:19 2008 +0100
+++ b/mcabber/src/hooks.c Thu Mar 27 23:40:39 2008 +0100
@@ -68,7 +68,7 @@
char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
GSList *roster_usr;
unsigned mucnicklen = 0;
- const char *name = NULL;
+ const char *ename = NULL;
if (encrypted)
message_flags |= HBB_PREFIX_PGPCRYPT;
@@ -203,18 +203,19 @@
}
if (settings_opt_get_int("eventcmd_use_nickname"))
- name = roster_getname(bjid);
+ ename = roster_getname(bjid);
// External command
// - We do not call hk_ext_cmd() for history lines in MUC
// - We do call hk_ext_cmd() for private messages in a room
// - We do call hk_ext_cmd() for messages to the current window
if (!active_window && ((is_groupchat && !timestamp) || !is_groupchat))
- hk_ext_cmd(name ? name : bjid, (is_groupchat ? 'G' : 'M'), 'R', wmsg);
+ hk_ext_cmd(ename ? ename : bjid, (is_groupchat ? 'G' : 'M'), 'R', wmsg);
// Display the sender in the log window
if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) &&
settings_opt_get_int("log_display_sender")) {
+ const char *name = roster_getname(bjid);
if (!name) name = "";
scr_LogPrint(LPRINT_NORMAL, "Message received from %s <%s/%s>",
name, bjid, (resname ? resname : ""));
@@ -293,14 +294,15 @@
char *bn = NULL;
char *logsmsg;
const char *rn = (resname ? resname : "");
- const char *name = NULL;
+ const char *ename = NULL;
if (settings_opt_get_int("eventcmd_use_nickname"))
- name = roster_getname(bjid);
+ ename = roster_getname(bjid);
st_in_buf = settings_opt_get_int("show_status_in_buffer");
buddy_format = settings_opt_get_int("buddy_format");
if (buddy_format) {
+ const char *name = roster_getname(bjid);
if (name && strcmp(name, bjid)) {
if (buddy_format == 1)
bn = g_strdup_printf("%s <%s/%s>", name, bjid, rn);
@@ -343,7 +345,7 @@
scr_DrawRoster();
hlog_write_status(bjid, timestamp, status, status_msg);
// External command
- hk_ext_cmd(name ? name : bjid, 'S', imstatus2char[status], NULL);
+ hk_ext_cmd(ename ? ename : bjid, 'S', imstatus2char[status], NULL);
}
void hk_mystatuschange(time_t timestamp, enum imstatus old_status,