From 228c1d7f366c0d103b00188a7945797068e4c741 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 15 Oct 2000 18:04:06 +0000 Subject: [PATCH] Some hilight+window activity related fixes git-svn-id: http://svn.irssi.org/repos/irssi/trunk@761 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/fe-common-core.c | 4 ++-- src/fe-common/core/fe-messages.c | 20 ++++++++++---------- src/fe-text/statusbar-items.c | 8 +++++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 06cd7ba1..b13aff10 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -108,7 +108,6 @@ void fe_common_core_init(void) fe_queries_init(); fe_ignore_init(); fe_log_init(); - fe_messages_init(); fe_modules_init(); fe_server_init(); fe_settings_init(); @@ -120,6 +119,7 @@ void fe_common_core_init(void) window_save_init(); fe_core_commands_init(); + fe_messages_init(); fe_ignore_messages_init(); } @@ -133,7 +133,6 @@ void fe_common_core_deinit(void) printtext_deinit(); fe_channels_deinit(); fe_queries_deinit(); - fe_messages_deinit(); fe_ignore_deinit(); fe_log_deinit(); fe_modules_deinit(); @@ -147,6 +146,7 @@ void fe_common_core_deinit(void) window_save_deinit(); fe_core_commands_deinit(); + fe_messages_deinit(); fe_ignore_messages_init(); theme_unregister(); diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c index eff180ac..1f10d3a8 100644 --- a/src/fe-common/core/fe-messages.c +++ b/src/fe-common/core/fe-messages.c @@ -379,16 +379,16 @@ void fe_messages_init(void) settings_add_bool("lookandfeel", "print_active_channel", FALSE); settings_add_bool("lookandfeel", "show_quit_once", FALSE); - signal_add_last("message public", (SIGNAL_FUNC) sig_message_public); - signal_add_last("message private", (SIGNAL_FUNC) sig_message_private); - signal_add_last("message join", (SIGNAL_FUNC) sig_message_join); - signal_add_last("message part", (SIGNAL_FUNC) sig_message_part); - signal_add_last("message quit", (SIGNAL_FUNC) sig_message_quit); - signal_add_last("message kick", (SIGNAL_FUNC) sig_message_kick); - signal_add_last("message nick", (SIGNAL_FUNC) sig_message_nick); - signal_add_last("message own_nick", (SIGNAL_FUNC) sig_message_own_nick); - signal_add_last("message invite", (SIGNAL_FUNC) sig_message_invite); - signal_add_last("message topic", (SIGNAL_FUNC) sig_message_topic); + signal_add("message public", (SIGNAL_FUNC) sig_message_public); + signal_add("message private", (SIGNAL_FUNC) sig_message_private); + signal_add("message join", (SIGNAL_FUNC) sig_message_join); + signal_add("message part", (SIGNAL_FUNC) sig_message_part); + signal_add("message quit", (SIGNAL_FUNC) sig_message_quit); + signal_add("message kick", (SIGNAL_FUNC) sig_message_kick); + signal_add("message nick", (SIGNAL_FUNC) sig_message_nick); + signal_add("message own_nick", (SIGNAL_FUNC) sig_message_own_nick); + signal_add("message invite", (SIGNAL_FUNC) sig_message_invite); + signal_add("message topic", (SIGNAL_FUNC) sig_message_topic); command_bind_last("msg", NULL, (SIGNAL_FUNC) cmd_msg); } diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c index 47639426..37c060dc 100644 --- a/src/fe-text/statusbar-items.c +++ b/src/fe-text/statusbar-items.c @@ -433,10 +433,12 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel activity_list = g_list_remove(activity_list, window); statusbar_item_redraw(activity_item); } - else if (window->new_data != GPOINTER_TO_INT(oldlevel)) + else if (window->new_data != GPOINTER_TO_INT(oldlevel) || + window->last_color != 0) { - /* different level as last time, just redraw it. */ - statusbar_item_redraw(activity_item); + /* different level as last time (or maybe different + hilight color?), just redraw it. */ + statusbar_item_redraw(activity_item); } return; }