Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / perl / ui / Window.xs

diff --git a/apps/irssi/src/perl/ui/Window.xs b/apps/irssi/src/perl/ui/Window.xs
index ac65480eaf6c7c1f4f27e3814093008441ab9d9e..ab52c910913a90f643db63d47b7ef4486922800b 100644 (file)
--- a/apps/irssi/src/perl/ui/Window.xs
+++ b/apps/irssi/src/perl/ui/Window.xs
@@ -1,5 +1,7 @@
 #include "module.h"
 
+#include "window-activity.h"
+
 MODULE = Irssi::UI::Window  PACKAGE = Irssi
 PROTOTYPES: ENABLE
 
@@ -158,7 +160,9 @@ CODE:
        old = active_win;
        active_win = window;
        perl_command(cmd, window->active_server, window->active);
-        active_win = old;
+       if (active_win == window &&
+           g_slist_find(windows, old) != NULL)
+               active_win = old;
 
 void
 window_item_add(window, item, automatic)
@@ -224,6 +228,10 @@ window_activity(window, data_level, hilight_color=NULL)
 char *
 window_get_active_name(window)
        Irssi::UI::Window window
+CODE:
+       RETVAL = (char *) window_get_active_name(window);
+OUTPUT:
+       RETVAL
 
 Irssi::Windowitem
 window_item_find(window, server, name)
@@ -245,7 +253,7 @@ print(item, str, level=MSGLEVEL_CLIENTNOTICE)
        int level
        char *str
 CODE:
-       printtext_string(item->server, item->name, level, str);
+       printtext_string(item->server, item->visible_name, level, str);
 
 Irssi::UI::Window
 window_create(item, automatic)