diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2007-06-16 14:58:13 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2007-06-16 14:58:13 +0000 |
| commit | f0cf56bda495c252d6d56105b05507a083721647 (patch) | |
| tree | 9073ee2e5fe7f0dea127b30c1f45371f35813e41 /src/fe-common/core/fe-queries.c | |
| parent | 3845518b3a8e0da42f75abf36120cf53e52ff2aa (diff) | |
| download | irssi-f0cf56bda495c252d6d56105b05507a083721647.zip | |
Revert r4549.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4555 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core/fe-queries.c')
| -rw-r--r-- | src/fe-common/core/fe-queries.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c index 22d35719..991b9bb5 100644 --- a/src/fe-common/core/fe-queries.c +++ b/src/fe-common/core/fe-queries.c @@ -76,18 +76,9 @@ static void signal_query_created(QUERY_REC *query, gpointer automatic) static void signal_query_created_curwin(QUERY_REC *query) { - WINDOW_REC *window; - int refnum; - g_return_if_fail(IS_QUERY(query)); - window = NULL; - refnum = GPOINTER_TO_INT(signal_get_user_data()); - if (refnum > 0) - window = window_find_refnum(refnum); - if (window == NULL) - window = active_win; - window_item_add(window, (WI_ITEM_REC *) query, window != active_win); + window_item_add(active_win, (WI_ITEM_REC *) query, FALSE); } static void signal_query_destroyed(QUERY_REC *query) @@ -235,8 +226,6 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) QUERY_REC *query; char *nick, *msg; void *free_arg; - char *arg; - int refnum; g_return_if_fail(data != NULL); @@ -261,11 +250,9 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (*nick != '=' && (server == NULL || !server->connected)) cmd_param_error(CMDERR_NOT_CONNECTED); - arg = g_hash_table_lookup(optlist, "window"); - if (arg != NULL) { - refnum = *arg != '\0' ? atoi(arg) : 0; - signal_add_data("query created", - (SIGNAL_FUNC) signal_query_created_curwin, GINT_TO_POINTER(refnum)); + if (g_hash_table_lookup(optlist, "window") != NULL) { + signal_add("query created", + (SIGNAL_FUNC) signal_query_created_curwin); } query = query_find(server, nick); @@ -281,9 +268,9 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) window_item_set_active(active_win, (WI_ITEM_REC *) query); } - if (arg != NULL) { - signal_remove_data("query created", - (SIGNAL_FUNC) signal_query_created_curwin, GINT_TO_POINTER(refnum)); + if (g_hash_table_lookup(optlist, "window") != NULL) { + signal_remove("query created", + (SIGNAL_FUNC) signal_query_created_curwin); } if (*msg != '\0') { @@ -386,7 +373,7 @@ void fe_queries_init(void) command_bind("unquery", NULL, (SIGNAL_FUNC) cmd_unquery); command_bind("window server", NULL, (SIGNAL_FUNC) cmd_window_server); - command_set_options("query", "@window"); + command_set_options("query", "window"); } void fe_queries_deinit(void) |