mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
"command complete" -> "complete command" so that it won't conflict with
/complete command .. also changed "word complete" to "complete word". git-svn-id: http://svn.irssi.org/repos/irssi/trunk@362 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
8fa6ca5e61
commit
0762fbc945
@ -140,7 +140,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos)
|
|||||||
|
|
||||||
last_linestart = g_strdup(linestart);
|
last_linestart = g_strdup(linestart);
|
||||||
want_space = TRUE;
|
want_space = TRUE;
|
||||||
signal_emit("word complete", 5, &complist, window, word, linestart, &want_space);
|
signal_emit("complete word", 5, &complist, window, word, linestart, &want_space);
|
||||||
last_want_space = want_space;
|
last_want_space = want_space;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,7 +340,7 @@ static char *line_get_command(const char *line, char **args)
|
|||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sig_word_complete(GList **list, WINDOW_REC *window,
|
static void sig_complete_word(GList **list, WINDOW_REC *window,
|
||||||
const char *word, const char *linestart, int *want_space)
|
const char *word, const char *linestart, int *want_space)
|
||||||
{
|
{
|
||||||
const char *newword, *cmdchars;
|
const char *newword, *cmdchars;
|
||||||
@ -394,7 +394,7 @@ static void sig_word_complete(GList **list, WINDOW_REC *window,
|
|||||||
|
|
||||||
cmd = line_get_command(linestart+1, &args);
|
cmd = line_get_command(linestart+1, &args);
|
||||||
if (cmd != NULL) {
|
if (cmd != NULL) {
|
||||||
signal = g_strconcat("command complete ", cmd, NULL);
|
signal = g_strconcat("complete command ", cmd, NULL);
|
||||||
signal_emit(signal, 5, list, window, word, args, want_space);
|
signal_emit(signal, 5, list, window, word, args, want_space);
|
||||||
|
|
||||||
g_free(signal);
|
g_free(signal);
|
||||||
@ -408,12 +408,12 @@ void completion_init(void)
|
|||||||
complist = NULL;
|
complist = NULL;
|
||||||
last_linestart = NULL;
|
last_linestart = NULL;
|
||||||
|
|
||||||
signal_add("word complete", (SIGNAL_FUNC) sig_word_complete);
|
signal_add("complete word", (SIGNAL_FUNC) sig_complete_word);
|
||||||
}
|
}
|
||||||
|
|
||||||
void completion_deinit(void)
|
void completion_deinit(void)
|
||||||
{
|
{
|
||||||
free_completions();
|
free_completions();
|
||||||
|
|
||||||
signal_remove("word complete", (SIGNAL_FUNC) sig_word_complete);
|
signal_remove("complete word", (SIGNAL_FUNC) sig_complete_word);
|
||||||
}
|
}
|
||||||
|
@ -444,7 +444,7 @@ void fe_irc_dcc_init(void)
|
|||||||
signal_add("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
|
signal_add("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
|
||||||
signal_add("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
|
signal_add("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
|
||||||
signal_add("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
|
signal_add("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
|
||||||
signal_add("command complete dcc send", (SIGNAL_FUNC) sig_dcc_send_complete);
|
signal_add("complete command dcc send", (SIGNAL_FUNC) sig_dcc_send_complete);
|
||||||
command_bind("msg", NULL, (SIGNAL_FUNC) cmd_msg);
|
command_bind("msg", NULL, (SIGNAL_FUNC) cmd_msg);
|
||||||
command_bind("me", NULL, (SIGNAL_FUNC) cmd_me);
|
command_bind("me", NULL, (SIGNAL_FUNC) cmd_me);
|
||||||
command_bind("action", NULL, (SIGNAL_FUNC) cmd_action);
|
command_bind("action", NULL, (SIGNAL_FUNC) cmd_action);
|
||||||
@ -477,7 +477,7 @@ void fe_irc_dcc_deinit(void)
|
|||||||
signal_remove("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
|
signal_remove("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
|
||||||
signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
|
signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
|
||||||
signal_remove("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
|
signal_remove("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
|
||||||
signal_remove("command complete dcc send", (SIGNAL_FUNC) sig_dcc_send_complete);
|
signal_remove("complete command dcc send", (SIGNAL_FUNC) sig_dcc_send_complete);
|
||||||
command_unbind("msg", (SIGNAL_FUNC) cmd_msg);
|
command_unbind("msg", (SIGNAL_FUNC) cmd_msg);
|
||||||
command_unbind("me", (SIGNAL_FUNC) cmd_me);
|
command_unbind("me", (SIGNAL_FUNC) cmd_me);
|
||||||
command_unbind("action", (SIGNAL_FUNC) cmd_action);
|
command_unbind("action", (SIGNAL_FUNC) cmd_action);
|
||||||
|
@ -300,7 +300,7 @@ static GList *completion_joinlist(GList *list1, GList *list2)
|
|||||||
return list1;
|
return list1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sig_word_complete(GList **list, WINDOW_REC *window,
|
static void sig_complete_word(GList **list, WINDOW_REC *window,
|
||||||
const char *word, const char *linestart)
|
const char *word, const char *linestart)
|
||||||
{
|
{
|
||||||
IRC_SERVER_REC *server;
|
IRC_SERVER_REC *server;
|
||||||
@ -485,7 +485,7 @@ void irc_completion_init(void)
|
|||||||
|
|
||||||
complete_tag = g_timeout_add(1000, (GSourceFunc) nick_completion_timeout, NULL);
|
complete_tag = g_timeout_add(1000, (GSourceFunc) nick_completion_timeout, NULL);
|
||||||
|
|
||||||
signal_add("word complete", (SIGNAL_FUNC) sig_word_complete);
|
signal_add("complete word", (SIGNAL_FUNC) sig_complete_word);
|
||||||
signal_add("event privmsg", (SIGNAL_FUNC) event_privmsg);
|
signal_add("event privmsg", (SIGNAL_FUNC) event_privmsg);
|
||||||
signal_add("command msg", (SIGNAL_FUNC) cmd_msg);
|
signal_add("command msg", (SIGNAL_FUNC) cmd_msg);
|
||||||
signal_add("nicklist remove", (SIGNAL_FUNC) sig_nick_removed);
|
signal_add("nicklist remove", (SIGNAL_FUNC) sig_nick_removed);
|
||||||
@ -499,7 +499,7 @@ void irc_completion_deinit(void)
|
|||||||
{
|
{
|
||||||
g_source_remove(complete_tag);
|
g_source_remove(complete_tag);
|
||||||
|
|
||||||
signal_remove("word complete", (SIGNAL_FUNC) sig_word_complete);
|
signal_remove("complete word", (SIGNAL_FUNC) sig_complete_word);
|
||||||
signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
|
signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
|
||||||
signal_remove("command msg", (SIGNAL_FUNC) cmd_msg);
|
signal_remove("command msg", (SIGNAL_FUNC) cmd_msg);
|
||||||
signal_remove("nicklist remove", (SIGNAL_FUNC) sig_nick_removed);
|
signal_remove("nicklist remove", (SIGNAL_FUNC) sig_nick_removed);
|
||||||
|
Loading…
Reference in New Issue
Block a user