Merges from Irssi CVS.

[runtime.git] / apps / irssi / src / fe-common / core / fe-channels.c

diff --git a/apps/irssi/src/fe-common/core/fe-channels.c b/apps/irssi/src/fe-common/core/fe-channels.c
index ec5d395bb14332cbac8b8e136894f024c895b011..27ad4365c0923831a163cdcdc97586bd1e2a19ab 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-channels.c
+++ b/apps/irssi/src/fe-common/core/fe-channels.c
@@ -67,7 +67,7 @@ static void signal_channel_destroyed(CHANNEL_REC *channel)
        window_item_destroy((WI_ITEM_REC *) channel);
 
        if (channel->joined && !channel->left &&
-           channel->server != NULL) {
+           !channel->server->disconnected) {
                /* kicked out from channel */
                window_bind_add(window, channel->server->tag,
                                channel->name);
@@ -132,21 +132,12 @@ static void cmd_join(const char *data, SERVER_REC *server)
        if (channel == NULL)
                return;
 
+       /* already joined to channel, set it active */
         window = window_item_window(channel);
+       if (window != active_win)
+               window_set_active(window);
 
-       if (window == active_win) {
-               /* channel is in active window, set it active */
-               window_item_set_active(active_win,
-                                      (WI_ITEM_REC *) channel);
-       } else {
-               /* notify user how to move the channel to active
-                  window. this was used to be done automatically
-                  but it just confused everyone who did it
-                  accidentally */
-               printformat_window(active_win, MSGLEVEL_CLIENTNOTICE,
-                                  TXT_CHANNEL_MOVE_NOTIFY, channel->name,
-                                  window->refnum);
-       }
+       window_item_set_active(active_win, (WI_ITEM_REC *) channel);
 }
 
 static void cmd_wjoin_post(const char *data)