mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
/WINDOW GOTO channel|query didn't work if their server was different from
the one in active window. Also removed a kludge of automatically trying to find #-prefixed channels if it wasn't given. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2716 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
64f9ecacbd
commit
88ee09e526
@ -338,23 +338,11 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
|
|||||||
|
|
||||||
item = server == NULL ? NULL :
|
item = server == NULL ? NULL :
|
||||||
window_item_find(server, name);
|
window_item_find(server, name);
|
||||||
if (item == NULL && server == NULL) {
|
if (item == NULL) {
|
||||||
/* not found from the active server - any server? */
|
/* not found from the active server - any server? */
|
||||||
item = window_item_find(NULL, name);
|
item = window_item_find(NULL, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item == NULL) {
|
|
||||||
char *chan;
|
|
||||||
|
|
||||||
/* still nothing? maybe user just left the # in front of
|
|
||||||
channel, try again with it.. */
|
|
||||||
chan = g_strdup_printf("#%s", name);
|
|
||||||
item = server == NULL ? NULL :
|
|
||||||
window_item_find(server, chan);
|
|
||||||
if (item == NULL) item = window_item_find(NULL, chan);
|
|
||||||
g_free(chan);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item == NULL)
|
if (item == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user