diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-01-01 19:29:05 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-01-01 19:29:05 +0000 |
| commit | ebeb48d30716ef0a3baac6103392f567a6bdadd6 (patch) | |
| tree | 47e154c8c448b7d67a3cc6ec1e2546e7f79aa4d7 /src | |
| parent | 3ef279fd1c1bfb421dd552bd3a9bcce83f7655f4 (diff) | |
| download | irssi-ebeb48d30716ef0a3baac6103392f567a6bdadd6.zip | |
Query bugfixes
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1048 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/queries.c | 18 | ||||
| -rw-r--r-- | src/core/servers.c | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/core/queries.c b/src/core/queries.c index 2468256d..6e5dd0a9 100644 --- a/src/core/queries.c +++ b/src/core/queries.c @@ -47,15 +47,16 @@ void query_init(QUERY_REC *query, int automatic) g_return_if_fail(query->name != NULL); queries = g_slist_append(queries, query); - if (query->server != NULL) { - query->server->queries = - g_slist_append(query->server->queries, query); - } MODULE_DATA_INIT(query); query->type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY"); - if (query->server_tag != NULL) + if (query->server_tag != NULL) { query->server = server_find_tag(query->server_tag); + if (query->server != NULL) { + query->server->queries = + g_slist_append(query->server->queries, query); + } + } signal_emit("query created", 2, query, GINT_TO_POINTER(automatic)); } @@ -141,6 +142,13 @@ void query_change_server(QUERY_REC *query, SERVER_REC *server) { g_return_if_fail(IS_QUERY(query)); + if (query->server != NULL) { + query->server->queries = + g_slist_remove(query->server->queries, query); + } + if (server != NULL) + server->queries = g_slist_append(server->queries, query); + query->server = server; signal_emit("query server changed", 1, query); } diff --git a/src/core/servers.c b/src/core/servers.c index 4550ce7f..ac0f5bef 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -302,8 +302,8 @@ static int server_remove_channels(SERVER_REC *server) found = TRUE; } - for (tmp = server->queries; tmp != NULL; tmp = tmp->next) - query_change_server(tmp->data, NULL); + while (server->queries != NULL) + query_change_server(server->queries->data, NULL); g_slist_free(server->channels); g_slist_free(server->queries); |