mirror of
https://github.com/irssi/irssi.git
synced 2025-02-02 15:08:01 -05:00
Clear window's waiting_channels list if some other channel/query is
created in the window. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@323 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
524a7ca1b9
commit
153e95f728
@ -218,12 +218,14 @@ void window_item_create(WI_ITEM_REC *item, int automatic)
|
|||||||
WINDOW_REC *window;
|
WINDOW_REC *window;
|
||||||
GSList *tmp;
|
GSList *tmp;
|
||||||
char *str;
|
char *str;
|
||||||
|
int clear_waiting;
|
||||||
|
|
||||||
g_return_if_fail(item != NULL);
|
g_return_if_fail(item != NULL);
|
||||||
|
|
||||||
str = item->server == NULL ? NULL :
|
str = item->server == NULL ? NULL :
|
||||||
g_strdup_printf("%s %s", ((SERVER_REC *) item->server)->tag, item->name);
|
g_strdup_printf("%s %s", ((SERVER_REC *) item->server)->tag, item->name);
|
||||||
|
|
||||||
|
clear_waiting = TRUE;
|
||||||
window = NULL;
|
window = NULL;
|
||||||
for (tmp = windows; tmp != NULL; tmp = tmp->next) {
|
for (tmp = windows; tmp != NULL; tmp = tmp->next) {
|
||||||
WINDOW_REC *rec = tmp->data;
|
WINDOW_REC *rec = tmp->data;
|
||||||
@ -239,6 +241,7 @@ void window_item_create(WI_ITEM_REC *item, int automatic)
|
|||||||
some waiting list? */
|
some waiting list? */
|
||||||
if (waiting_channels_get(rec, str)) {
|
if (waiting_channels_get(rec, str)) {
|
||||||
window = rec;
|
window = rec;
|
||||||
|
clear_waiting = FALSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -252,6 +255,13 @@ void window_item_create(WI_ITEM_REC *item, int automatic)
|
|||||||
/* use existing window */
|
/* use existing window */
|
||||||
window_add_item(window, item, automatic);
|
window_add_item(window, item, automatic);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (clear_waiting) {
|
||||||
|
/* clear window's waiting_channels list */
|
||||||
|
g_slist_foreach(window->waiting_channels, (GFunc) g_free, NULL),
|
||||||
|
g_slist_free(window->waiting_channels);
|
||||||
|
window->waiting_channels = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
|
static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
|
||||||
|
Loading…
Reference in New Issue
Block a user