zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 21:00:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert r4549.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4555 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-06-16 14:58:13 +00:00 • committed by exg
commit f0cf56bda4
2 changed files with 16 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/fe-common/core/fe-queries.c
View file

@ -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)