X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-common%2Fcore%2Ffe-windows.c;h=06621c776a2e83b7eaf435cff6ffc4456505d62c;hb=63ca577177f9f5db8e553372a9793b0c85f10715;hp=dc264d657a5ac47a7433f0395d8fc8e80cb6e92b;hpb=60c165f23f8d5553bd8b4fd43366fbf5f24c2832;p=silc.git

diff --git a/apps/irssi/src/fe-common/core/fe-windows.c b/apps/irssi/src/fe-common/core/fe-windows.c
index dc264d65..06621c77 100644
--- a/apps/irssi/src/fe-common/core/fe-windows.c
+++ b/apps/irssi/src/fe-common/core/fe-windows.c
@@ -70,7 +70,7 @@ WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic)
 
 	rec = g_new0(WINDOW_REC, 1);
 	rec->refnum = window_get_new_refnum();
-	rec->level = level2bits(settings_get_str("window_default_level"));
+	rec->level = settings_get_level("window_default_level");
 
 	windows = g_slist_prepend(windows, rec);
 	signal_emit("window created", 2, rec, GINT_TO_POINTER(automatic));
@@ -308,8 +308,11 @@ WINDOW_REC *window_find_closest(void *server, const char *name, int level)
 			/* match, but if multiple windows have the same level
 			   we could be choosing a bad one here, eg.
 			   name=nick1 would get nick2's query instead of
-			   generic msgs window. */
-			if (g_strcasecmp(name, item->visible_name) == 0)
+			   generic msgs window.
+
+	                   And check for prefixed !channel name --Borys  */
+			if (g_strcasecmp(name, item->visible_name) == 0 ||
+			    g_strcasecmp(name, (char *) window_item_get_target((WI_ITEM_REC *) item)) == 0)
 				return namewindow;
 		}
 	}
@@ -646,7 +649,7 @@ void windows_init(void)
 	settings_add_bool("lookandfeel", "window_auto_change", FALSE);
 	settings_add_bool("lookandfeel", "windows_auto_renumber", TRUE);
 	settings_add_bool("lookandfeel", "window_check_level_first", FALSE);
-	settings_add_str("lookandfeel", "window_default_level", "NONE");
+	settings_add_level("lookandfeel", "window_default_level", "NONE");
 
 	read_settings();
 	signal_add("server looking", (SIGNAL_FUNC) sig_server_connected);