From d8db9224d9dce952a502de6c827afc6d75f8f766 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Sat, 24 Nov 2018 20:04:46 +0100 Subject: [PATCH] signal_emit__ -> SIGNAL_EMIT --- src/core/capsicum.c | 12 ++++----- src/core/channels-setup.c | 6 ++--- src/core/channels.c | 8 +++--- src/core/chat-commands.c | 26 +++++++++---------- src/core/chat-protocols.c | 6 ++--- src/core/chatnets.c | 10 ++++---- src/core/commands.c | 18 +++++++------- src/core/commands.h | 2 +- src/core/core.c | 2 +- src/core/expandos.c | 4 +-- src/core/ignore.c | 6 ++--- src/core/log-away.c | 2 +- src/core/log.c | 20 +++++++-------- src/core/modules-load.c | 8 +++--- src/core/network-openssl.c | 2 +- src/core/nicklist.c | 12 ++++----- src/core/pidwait.c | 2 +- src/core/queries.c | 12 ++++----- src/core/rawlog.c | 2 +- src/core/servers-reconnect.c | 12 ++++----- src/core/servers-setup.c | 16 ++++++------ src/core/servers.c | 16 ++++++------ src/core/session.c | 18 +++++++------- src/core/settings.c | 28 ++++++++++----------- src/core/special-vars.c | 2 +- src/fe-common/core/chat-completion.c | 2 +- src/fe-common/core/completion.c | 12 ++++----- src/fe-common/core/fe-channels.c | 8 +++--- src/fe-common/core/fe-common-core.c | 8 +++--- src/fe-common/core/fe-core-commands.c | 8 +++--- src/fe-common/core/fe-exec.c | 12 ++++----- src/fe-common/core/fe-log.c | 2 +- src/fe-common/core/fe-queries.c | 4 +-- src/fe-common/core/fe-recode.c | 6 ++--- src/fe-common/core/fe-server.c | 2 +- src/fe-common/core/fe-settings.c | 8 +++--- src/fe-common/core/fe-windows.c | 28 ++++++++++----------- src/fe-common/core/formats.c | 6 ++--- src/fe-common/core/hilight-text.c | 6 ++--- src/fe-common/core/keyboard.c | 20 +++++++-------- src/fe-common/core/printtext.c | 16 ++++++------ src/fe-common/core/themes.c | 8 +++--- src/fe-common/core/window-activity.c | 10 ++++---- src/fe-common/core/window-commands.c | 12 ++++----- src/fe-common/core/window-items.c | 14 +++++------ src/fe-common/core/windows-layout.c | 14 +++++------ src/fe-common/irc/dcc/fe-dcc-chat.c | 14 +++++------ src/fe-common/irc/dcc/fe-dcc.c | 2 +- src/fe-common/irc/fe-ctcp.c | 10 ++++---- src/fe-common/irc/fe-events.c | 32 ++++++++++++------------ src/fe-common/irc/fe-irc-commands.c | 18 +++++++------- src/fe-fuzz/server.c | 4 +-- src/fe-text/gui-printtext.c | 2 +- src/fe-text/gui-readline.c | 36 +++++++++++++-------------- src/fe-text/gui-windows.c | 8 +++--- src/fe-text/irssi.c | 4 +-- src/fe-text/lastlog.c | 2 +- src/fe-text/mainwindows-layout.c | 2 +- src/fe-text/mainwindows.c | 10 ++++---- src/fe-text/statusbar.c | 8 +++--- src/fe-text/term-terminfo.c | 2 +- src/fe-text/textbuffer-view.c | 2 +- src/irc/core/bans.c | 2 +- src/irc/core/channel-events.c | 2 +- src/irc/core/channel-rejoin.c | 4 +-- src/irc/core/channels-query.c | 4 +-- src/irc/core/ctcp.c | 14 +++++------ src/irc/core/irc-cap.c | 16 ++++++------ src/irc/core/irc-channels.c | 2 +- src/irc/core/irc-commands.c | 26 +++++++++---------- src/irc/core/irc-core.c | 2 +- src/irc/core/irc-nicklist.c | 2 +- src/irc/core/irc-servers-setup.c | 2 +- src/irc/core/irc-servers.c | 2 +- src/irc/core/irc-session.c | 6 ++--- src/irc/core/irc.c | 8 +++--- src/irc/core/lag.c | 4 +-- src/irc/core/massjoin.c | 2 +- src/irc/core/mode-lists.c | 4 +-- src/irc/core/modes.c | 14 +++++------ src/irc/core/netsplit.c | 8 +++--- src/irc/core/sasl.c | 12 ++++----- src/irc/dcc/dcc-autoget.c | 2 +- src/irc/dcc/dcc-chat.c | 30 +++++++++++----------- src/irc/dcc/dcc-get.c | 22 ++++++++-------- src/irc/dcc/dcc-resume.c | 6 ++--- src/irc/dcc/dcc-send.c | 18 +++++++------- src/irc/dcc/dcc-server.c | 12 ++++----- src/irc/dcc/dcc.c | 24 +++++++++--------- src/irc/flood/flood.c | 2 +- src/irc/notifylist/notifylist.c | 8 +++--- src/irc/proxy/listen.c | 12 ++++----- src/irc/proxy/proxy.c | 4 +-- src/otr/otr-module.c | 4 +-- src/otr/otr-ops.c | 2 +- src/otr/otr.c | 2 +- src/perl/common/Expando.xs | 2 +- src/perl/perl-common.c | 2 +- src/perl/perl-core.c | 4 +-- src/perl/perl-signals.c | 2 +- src/perl/perl-sources.c | 2 +- src/perl/textui/Statusbar.xs | 2 +- tests/irc/core/test-channel-events.c | 6 ++--- tests/irc/flood/test-796.c | 6 ++--- 104 files changed, 462 insertions(+), 462 deletions(-) diff --git a/src/core/capsicum.c b/src/core/capsicum.c index 2fcd8ceb..2ea05c44 100644 --- a/src/core/capsicum.c +++ b/src/core/capsicum.c @@ -412,7 +412,7 @@ static void cmd_capsicum_enter(void) inited = irssi_ssl_init(); if (!inited) { - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); return; } @@ -432,13 +432,13 @@ static void cmd_capsicum_enter(void) irclogs_fd = open(irclogs_path, O_DIRECTORY | O_CLOEXEC); if (irclogs_fd < 0) { g_warning("Unable to open %s: %s", irclogs_path, strerror(errno)); - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); return; } error = start_symbiont(); if (error != 0) { - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); return; } @@ -452,13 +452,13 @@ static void cmd_capsicum_enter(void) if (limit_stdio_fd(STDIN_FILENO) != 0 || limit_stdio_fd(STDOUT_FILENO) != 0 || limit_stdio_fd(STDERR_FILENO) != 0) { - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); return; } error = cap_enter(); if (error != 0) { - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); } else { signal_emit("capability mode enabled", 0); } @@ -471,7 +471,7 @@ static void cmd_capsicum_status(void) error = cap_getmode(&mode); if (error != 0) { - signal_emit__capability_mode_failed(strerror(errno)); + SIGNAL_EMIT(capability_mode_failed, strerror(errno)); } else if (mode == 0) { signal_emit("capability mode disabled", 0); } else { diff --git a/src/core/channels-setup.c b/src/core/channels-setup.c index f37fe3fb..9407c109 100644 --- a/src/core/channels-setup.c +++ b/src/core/channels-setup.c @@ -86,7 +86,7 @@ void channel_setup_create(CHANNEL_SETUP_REC *channel) setupchannels = g_slist_append(setupchannels, channel); channel_setup_save(channel); - signal_emit__channel_setup_created(channel, NULL); + SIGNAL_EMIT(channel_setup_created, channel, NULL); } static void channel_config_remove(CHANNEL_SETUP_REC *channel) @@ -113,7 +113,7 @@ static void channel_setup_destroy(CHANNEL_SETUP_REC *channel) g_return_if_fail(channel != NULL); setupchannels = g_slist_remove(setupchannels, channel); - signal_emit__channel_setup_destroyed(channel); + SIGNAL_EMIT(channel_setup_destroyed, channel); g_free_not_null(channel->chatnet); g_free_not_null(channel->password); @@ -190,7 +190,7 @@ static CHANNEL_SETUP_REC *channel_setup_read(CONFIG_NODE *node) rec->autosendcmd = g_strdup(config_node_get_str(node, "autosendcmd", NULL)); setupchannels = g_slist_append(setupchannels, rec); - signal_emit__channel_setup_created(rec, node); + SIGNAL_EMIT(channel_setup_created, rec, node); return rec; } diff --git a/src/core/channels.c b/src/core/channels.c index 9bf14396..fd206241 100644 --- a/src/core/channels.c +++ b/src/core/channels.c @@ -68,7 +68,7 @@ void channel_init(CHANNEL_REC *channel, SERVER_REC *server, const char *name, channels = g_slist_append(channels, channel); server->channels = g_slist_append(server->channels, channel); - signal_emit__channel_created(channel, GINT_TO_POINTER(automatic)); + SIGNAL_EMIT(channel_created, channel, GINT_TO_POINTER(automatic)); } void channel_destroy(CHANNEL_REC *channel) @@ -82,7 +82,7 @@ void channel_destroy(CHANNEL_REC *channel) channel->server->channels = g_slist_remove(channel->server->channels, channel); - signal_emit__channel_destroyed(channel); + SIGNAL_EMIT(channel_destroyed, channel); MODULE_DATA_DEINIT(channel); g_free_not_null(channel->hilight_color); @@ -140,7 +140,7 @@ void channel_change_name(CHANNEL_REC *channel, const char *name) g_free(channel->name); channel->name = g_strdup(name); - signal_emit__channel_name_changed(channel); + SIGNAL_EMIT(channel_name_changed, channel); } void channel_change_visible_name(CHANNEL_REC *channel, const char *name) @@ -150,7 +150,7 @@ void channel_change_visible_name(CHANNEL_REC *channel, const char *name) g_free(channel->visible_name); channel->visible_name = g_strdup(name); - signal_emit__window_item_name_changed((WI_ITEM_REC *)channel); + SIGNAL_EMIT(window_item_name_changed, (WI_ITEM_REC *)channel); } static CHANNEL_REC *channel_find_servers(GSList *servers, const char *name) diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c index 412cdd60..966b38e9 100644 --- a/src/core/chat-commands.c +++ b/src/core/chat-commands.c @@ -53,7 +53,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, if (plus_addr != NULL) *plus_addr = *addr == '+'; if (*addr == '+') addr++; if (*addr == '\0') { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_NOT_ENOUGH_PARAMS), NULL); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_NOT_ENOUGH_PARAMS), NULL); cmd_params_free(free_arg); return NULL; } @@ -74,7 +74,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, conn = server_create_conn(proto != NULL ? proto->id : -1, addr, atoi(portstr), chatnet, password, nick); if (conn == NULL) { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_NO_SERVER_DEFINED), NULL); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_NO_SERVER_DEFINED), NULL); cmd_params_free(free_arg); return NULL; } @@ -84,7 +84,7 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, if (proto->not_initialized) { /* trying to use protocol that isn't yet initialized */ - signal_emit__chat_protocol_unknown(proto->name); + SIGNAL_EMIT(chat_protocol_unknown, proto->name); server_connect_unref(conn); cmd_params_free(free_arg); return NULL; @@ -238,7 +238,7 @@ static void update_reconnection(SERVER_CONNECT_REC *conn, SERVER_REC *server) server_connect_unref(oldconn); if (server != NULL) { - signal_emit__command_("disconnect", "* Changing server", server, NULL); + SIGNAL_EMIT_(command, "disconnect", "* Changing server", server, NULL); } } @@ -298,7 +298,7 @@ static void cmd_disconnect(const char *data, SERVER_REC *server) if (server == NULL) cmd_param_error(CMDERR_NOT_CONNECTED); if (*msg == '\0') msg = (char *) settings_get_str("quit_message"); - signal_emit__server_quit(server, msg); + SIGNAL_EMIT(server_quit, server, msg); cmd_params_free(free_arg); server_disconnect(server); @@ -325,7 +325,7 @@ static void cmd_quit(const char *data) g_free(str); } - signal_emit__gui_exit(); + SIGNAL_EMIT(gui_exit); } /* SYNTAX: MSG [-] [-channel | -nick] *| */ @@ -402,17 +402,17 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item) splitmsgs = singlemsg; while ((m = splitmsgs[n++])) { - signal_emit__server_sendmsg(server, target, m, + SIGNAL_EMIT(server_sendmsg, server, target, m, GINT_TO_POINTER(target_type)); if (target_type == SEND_TARGET_CHANNEL) { - signal_emit__message_own__public(server, m, target); + SIGNAL_EMIT(message_own__public, server, m, target); } else { - signal_emit__message_own__private(server, m, target, origtarget); + SIGNAL_EMIT(message_own__private, server, m, target, origtarget); } } g_strfreev(tmp); } else { - signal_emit__message_own__private(server, msg, target, + SIGNAL_EMIT(message_own__private, server, msg, target, origtarget); } @@ -446,7 +446,7 @@ static void cmd_foreach_server(const char *data, SERVER_REC *server) list = g_slist_copy(servers); while (list != NULL) { - signal_emit__send_command(str, list->data, NULL); + SIGNAL_EMIT(send_command, str, list->data, NULL); list = g_slist_remove(list, list->data); } @@ -468,7 +468,7 @@ static void cmd_foreach_channel(const char *data) while (list != NULL) { CHANNEL_REC *rec = list->data; - signal_emit__send_command(str, rec->server, (WI_ITEM_REC *)rec); + SIGNAL_EMIT(send_command, str, rec->server, (WI_ITEM_REC *)rec); list = g_slist_remove(list, list->data); } @@ -490,7 +490,7 @@ static void cmd_foreach_query(const char *data) while (list != NULL) { QUERY_REC *rec = list->data; - signal_emit__send_command(str, rec->server, (WI_ITEM_REC *)rec); + SIGNAL_EMIT(send_command, str, rec->server, (WI_ITEM_REC *)rec); list = g_slist_remove(list, list->data); } diff --git a/src/core/chat-protocols.c b/src/core/chat-protocols.c index e3dcb60f..9342fbfd 100644 --- a/src/core/chat-protocols.c +++ b/src/core/chat-protocols.c @@ -126,9 +126,9 @@ CHAT_PROTOCOL_REC *chat_protocol_register(CHAT_PROTOCOL_REC *rec) chat_protocol_set_default(newrec); if (created) - signal_emit__chat_protocol_created(newrec); + SIGNAL_EMIT(chat_protocol_created, newrec); else - signal_emit__chat_protocol_updated(newrec); + SIGNAL_EMIT(chat_protocol_updated, newrec); return newrec; } @@ -143,7 +143,7 @@ static void chat_protocol_destroy(CHAT_PROTOCOL_REC *rec) chat_protocols->data); } - signal_emit__chat_protocol_destroyed(rec); + SIGNAL_EMIT(chat_protocol_destroyed, rec); g_free(rec->name); g_free(rec); diff --git a/src/core/chatnets.c b/src/core/chatnets.c index 62df0b56..31a86a2f 100644 --- a/src/core/chatnets.c +++ b/src/core/chatnets.c @@ -49,7 +49,7 @@ static void chatnet_config_save(CHATNET_REC *chatnet) iconfig_node_set_str(node, "host", chatnet->own_host); iconfig_node_set_str(node, "autosendcmd", chatnet->autosendcmd); - signal_emit__chatnet_saved(chatnet, node); + SIGNAL_EMIT(chatnet_saved, chatnet, node); } static void chatnet_config_remove(CHATNET_REC *chatnet) @@ -69,14 +69,14 @@ void chatnet_create(CHATNET_REC *chatnet) chatnets = g_slist_append(chatnets, chatnet); chatnet_config_save(chatnet); - signal_emit__chatnet_created(chatnet); + SIGNAL_EMIT(chatnet_created, chatnet); } void chatnet_remove(CHATNET_REC *chatnet) { g_return_if_fail(IS_CHATNET(chatnet)); - signal_emit__chatnet_removed(chatnet); + SIGNAL_EMIT(chatnet_removed, chatnet); chatnet_config_remove(chatnet); chatnet_destroy(chatnet); @@ -87,7 +87,7 @@ void chatnet_destroy(CHATNET_REC *chatnet) g_return_if_fail(IS_CHATNET(chatnet)); chatnets = g_slist_remove(chatnets, chatnet); - signal_emit__chatnet_destroyed(chatnet); + SIGNAL_EMIT(chatnet_destroyed, chatnet); g_free_not_null(chatnet->nick); g_free_not_null(chatnet->username); @@ -159,7 +159,7 @@ static void chatnet_read(CONFIG_NODE *node) rec->autosendcmd = g_strdup(config_node_get_str(node, "autosendcmd", NULL)); chatnets = g_slist_append(chatnets, rec); - signal_emit__chatnet_read(rec, node); + SIGNAL_EMIT(chatnet_read, rec, node); } static void read_chatnets(void) diff --git a/src/core/commands.c b/src/core/commands.c index 0cd9449d..f46a06ea 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -172,13 +172,13 @@ void command_bind_full(const char *module, int priority, const char *cmd, g_free(str); } - signal_emit__commandlist_new(rec); + SIGNAL_EMIT(commandlist_new, rec); } static void command_free(COMMAND_REC *rec) { commands = g_slist_remove(commands, rec); - signal_emit__commandlist_remove(rec); + SIGNAL_EMIT(commandlist_remove, rec); g_free_not_null(rec->category); g_strfreev(rec->options); @@ -286,7 +286,7 @@ static const char *command_expand(char *cmd) } if (multiple) { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_AMBIGUOUS), cmd); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_AMBIGUOUS), cmd); return NULL; } @@ -305,7 +305,7 @@ void command_runsub(const char *cmd, const char *data, if (*data == '\0') { /* no subcommand given - list the subcommands */ - signal_emit__list_subcommands(cmd); + SIGNAL_EMIT(list_subcommands, cmd); return; } @@ -329,7 +329,7 @@ void command_runsub(const char *cmd, const char *data, if (!signal_emit_raw(subcmd, 3, args, server, item)) { defcmd = g_strdup_printf("default command %s", cmd); if (!signal_emit_raw(defcmd, 3, data, server, item)) { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_UNKNOWN), subcmd+8); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_UNKNOWN), subcmd+8); } g_free(defcmd); } @@ -768,7 +768,7 @@ int cmd_get_params(const char *data, gpointer *free_me, int count, ...) va_end(args); if (error) { - signal_emit__error_command(GINT_TO_POINTER(error), datad); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(error), datad); signal_stop(); cmd_params_free(rec); @@ -890,7 +890,7 @@ static void parse_command(const char *command, int expand_aliases, if (rec != NULL && !cmd_protocol_match(rec, server)) { g_free(orig); - signal_emit__error_command(GINT_TO_POINTER(server == NULL ? + SIGNAL_EMIT(error_command, GINT_TO_POINTER(server == NULL ? CMDERR_NOT_CONNECTED : CMDERR_ILLEGAL_PROTO), NULL); return; @@ -903,7 +903,7 @@ static void parse_command(const char *command, int expand_aliases, current_command = cmd+8; if (server != NULL) server_ref(server); if (!signal_emit_raw(cmd, 3, args, server, item)) { - signal_emit__default_command( + SIGNAL_EMIT(default_command, command, server, item); } if (server != NULL) { @@ -933,7 +933,7 @@ static void event_command(const char *line, SERVER_REC *server, WI_ITEM_REC *ite } if (cmdchar == NULL) { /* non-command - let someone else handle this */ - signal_emit__send_text(line, server, item); + SIGNAL_EMIT(send_text, line, server, item); return; } diff --git a/src/core/commands.h b/src/core/commands.h index c69f3b7f..43225829 100644 --- a/src/core/commands.h +++ b/src/core/commands.h @@ -52,7 +52,7 @@ enum { /* Returning from command function with error */ #define cmd_return_error(a) \ G_STMT_START { \ - signal_emit__error_command(GINT_TO_POINTER(a), NULL); \ + SIGNAL_EMIT(error_command, GINT_TO_POINTER(a), NULL); \ signal_stop(); \ return; \ } G_STMT_END diff --git a/src/core/core.c b/src/core/core.c index 7b6b4601..29f7810d 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -151,7 +151,7 @@ static void sig_init_finished(void) type = dialog_type_queue; text = dialog_text_queue; for (; text != NULL; text = text->next, type = type->next) { - signal_emit__gui_dialog(type->data, text->data); + SIGNAL_EMIT(gui_dialog, type->data, text->data); g_free(type->data); g_free(text->data); } diff --git a/src/core/expandos.c b/src/core/expandos.c index 40fdc202..1eab52ed 100644 --- a/src/core/expandos.c +++ b/src/core/expandos.c @@ -552,7 +552,7 @@ static int sig_timer(void) struct tm *tm; int last_min; - signal_emit__expando_timer(); + SIGNAL_EMIT(expando_timer); /* check if $Z has changed */ now = time(NULL); @@ -567,7 +567,7 @@ static int sig_timer(void) return 1; } - signal_emit__time_changed(); + SIGNAL_EMIT(time_changed); last_timestamp = now; } diff --git a/src/core/ignore.c b/src/core/ignore.c index 70d9a4b9..e6a3d774 100644 --- a/src/core/ignore.c +++ b/src/core/ignore.c @@ -391,7 +391,7 @@ void ignore_add_rec(IGNORE_REC *rec) ignores = g_slist_append(ignores, rec); ignore_set_config(rec); - signal_emit__ignore_created(rec); + SIGNAL_EMIT(ignore_created, rec); nickmatch_rebuild(nickmatch); } @@ -399,7 +399,7 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal) { ignores = g_slist_remove(ignores, rec); if (send_signal) - signal_emit__ignore_destroyed(rec); + SIGNAL_EMIT(ignore_destroyed, rec); if (rec->preg != NULL) i_regex_unref(rec->preg); if (rec->channels != NULL) g_strfreev(rec->channels); @@ -424,7 +424,7 @@ void ignore_update_rec(IGNORE_REC *rec) ignore_set_config(rec); ignore_init_rec(rec); - signal_emit__ignore_changed(rec); + SIGNAL_EMIT(ignore_changed, rec); } nickmatch_rebuild(nickmatch); } diff --git a/src/core/log-away.c b/src/core/log-away.c index ab2eaad1..914f8e0f 100644 --- a/src/core/log-away.c +++ b/src/core/log-away.c @@ -92,7 +92,7 @@ static void awaylog_close(void) /* Flush the dirty buffers to disk before showing the away log */ write_buffer_flush(); - signal_emit__awaylog_show(log, GINT_TO_POINTER(away_msgs), + SIGNAL_EMIT(awaylog_show, log, GINT_TO_POINTER(away_msgs), GINT_TO_POINTER(away_filepos)); log_close(log); } diff --git a/src/core/log.c b/src/core/log.c index 750b77c9..7e34d128 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -137,7 +137,7 @@ int log_start_logging(LOG_REC *log) log_file_create_mode); #endif if (log->handle == -1) { - signal_emit__log_create_failed(log); + SIGNAL_EMIT(log_create_failed, log); log->failed = TRUE; return FALSE; } @@ -146,7 +146,7 @@ int log_start_logging(LOG_REC *log) if (fcntl(log->handle, F_SETLK, &lock) == -1 && errno == EACCES) { close(log->handle); log->handle = -1; - signal_emit__log_locked(log); + SIGNAL_EMIT(log_locked, log); log->failed = TRUE; return FALSE; } @@ -157,7 +157,7 @@ int log_start_logging(LOG_REC *log) settings_get_str("log_open_string"), "\n", log->last); - signal_emit__log_started(log); + SIGNAL_EMIT(log_started, log); log->failed = FALSE; return TRUE; } @@ -171,7 +171,7 @@ void log_stop_logging(LOG_REC *log) if (log->handle == -1) return; - signal_emit__log_stopped(log); + SIGNAL_EMIT(log_stopped, log); log_write_timestamp(log->handle, settings_get_str("log_close_string"), @@ -199,7 +199,7 @@ static void log_rotate_check(LOG_REC *log) if (g_strcmp0(new_fname, log->real_fname) != 0) { /* rotate log */ log_stop_logging(log); - signal_emit__log_rotated(log); + SIGNAL_EMIT(log_rotated, log); log_start_logging(log); } @@ -251,7 +251,7 @@ void log_write_rec(LOG_REC *log, const char *str, int level) write_buffer(log->handle, str, strlen(str)); write_buffer(log->handle, "\n", 1); - signal_emit__log_written(log, str); + SIGNAL_EMIT(log_written, log, str); g_free_not_null(colorstr); } @@ -383,7 +383,7 @@ static void log_update_config(LOG_REC *log) if (log->items != NULL) log_items_update_config(log, node); - signal_emit__log_config_save(log, node); + SIGNAL_EMIT(log_config_save, log, node); } static void log_remove_config(LOG_REC *log) @@ -438,7 +438,7 @@ void log_update(LOG_REC *log) } log_update_config(log); - signal_emit__log_new(log); + SIGNAL_EMIT(log_new, log); } void log_item_destroy(LOG_REC *log, LOG_ITEM_REC *item) @@ -458,7 +458,7 @@ static void log_destroy(LOG_REC *log) log_stop_logging(log); logs = g_slist_remove(logs, log); - signal_emit__log_remove(log); + SIGNAL_EMIT(log_remove, log); while (log->items != NULL) log_item_destroy(log, log->items->data); @@ -557,7 +557,7 @@ static void log_read_config(void) log->autoopen = config_node_get_bool(node, "auto_open", FALSE); log->level = level2bits(config_node_get_str(node, "level", 0), NULL); - signal_emit__log_config_read(log, node); + SIGNAL_EMIT(log_config_read, log, node); node = iconfig_node_section(node, "items", -1); if (node != NULL) diff --git a/src/core/modules-load.c b/src/core/modules-load.c index 96ecbeb3..d21f1c3b 100644 --- a/src/core/modules-load.c +++ b/src/core/modules-load.c @@ -151,7 +151,7 @@ static char *module_get_func(const char *rootmodule, const char *submodule, } #define module_error(error, text, rootmodule, submodule) \ - signal_emit__module_error(GINT_TO_POINTER(error), text, \ + SIGNAL_EMIT(module_error, GINT_TO_POINTER(error), text, \ rootmodule, submodule) /* Returns 1 if ok, 0 if error in module and @@ -244,7 +244,7 @@ static int module_load_name(const char *path, const char *rootmodule, settings_check_module(rec->defined_module_name); - signal_emit__module_loaded(rec->root, rec); + SIGNAL_EMIT(module_loaded, rec->root, rec); return 1; } @@ -413,7 +413,7 @@ void module_file_unload(MODULE_FILE_REC *file) root->files = g_slist_remove(root->files, file); if (file->initialized) - signal_emit__module_unloaded(file->root, file); + SIGNAL_EMIT(module_unloaded, file->root, file); #ifdef HAVE_GMODULE if (file->gmodule != NULL) @@ -434,7 +434,7 @@ void module_unload(MODULE_REC *module) modules = g_slist_remove(modules, module); - signal_emit__module_unloaded(module, NULL); + SIGNAL_EMIT(module_unloaded, module, NULL); while (module->files != NULL) module_file_unload(module->files->data); diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index 001397a0..2905ecd1 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -886,7 +886,7 @@ int irssi_ssl_handshake(GIOChannel *handle) set_server_temporary_key_info(tls, chan->ssl); /* Emit the TLS rec. */ - signal_emit__tls_handshake_finished(chan->server, tls); + SIGNAL_EMIT(tls_handshake_finished, chan->server, tls); ret = 1; diff --git a/src/core/nicklist.c b/src/core/nicklist.c index 2f75f926..ab802d8e 100644 --- a/src/core/nicklist.c +++ b/src/core/nicklist.c @@ -86,7 +86,7 @@ void nicklist_insert(CHANNEL_REC *channel, NICK_REC *nick) nick->chat_type = channel->chat_type; nick_hash_add(channel, nick); - signal_emit__nicklist_new(channel, nick); + SIGNAL_EMIT(nicklist_new, channel, nick); } /* Set host address for nick */ @@ -99,12 +99,12 @@ void nicklist_set_host(CHANNEL_REC *channel, NICK_REC *nick, const char *host) g_free_not_null(nick->host); nick->host = g_strdup(host); - signal_emit__nicklist_host_changed(channel, nick); + SIGNAL_EMIT(nicklist_host_changed, channel, nick); } static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick) { - signal_emit__nicklist_remove(channel, nick); + SIGNAL_EMIT(nicklist_remove, channel, nick); if (channel->ownnick == nick) channel->ownnick = NULL; @@ -150,7 +150,7 @@ static void nicklist_rename_list(SERVER_REC *server, void *new_nick_id, /* add new nick to hash table */ nick_hash_add(channel, nickrec); - signal_emit__nicklist_changed(channel, nickrec, old_nick); + SIGNAL_EMIT(nicklist_changed, channel, nickrec, old_nick); } g_slist_free(nicks); } @@ -396,12 +396,12 @@ static void nicklist_update_flags_list(SERVER_REC *server, int gone, if (gone != -1 && (int)rec->gone != gone) { rec->gone = gone; - signal_emit__nicklist_gone_changed(channel, rec); + SIGNAL_EMIT(nicklist_gone_changed, channel, rec); } if (serverop != -1 && (int)rec->serverop != serverop) { rec->serverop = serverop; - signal_emit__nicklist_serverop_changed(channel, rec); + SIGNAL_EMIT(nicklist_serverop_changed, channel, rec); } } g_slist_free(nicks); diff --git a/src/core/pidwait.c b/src/core/pidwait.c index 38cec30b..bf95892f 100644 --- a/src/core/pidwait.c +++ b/src/core/pidwait.c @@ -30,7 +30,7 @@ static int signal_pidwait; static void sig_child(GPid pid, gint status, gpointer data) { - signal_emit__pidwait(GINT_TO_POINTER(pid), + SIGNAL_EMIT(pidwait, GINT_TO_POINTER(pid), GINT_TO_POINTER(status)); g_hash_table_remove(child_pids, GINT_TO_POINTER(pid)); pids = g_slist_remove(pids, GINT_TO_POINTER(pid)); diff --git a/src/core/queries.c b/src/core/queries.c index 1f1a1ebd..d66e9c8f 100644 --- a/src/core/queries.c +++ b/src/core/queries.c @@ -56,7 +56,7 @@ void query_init(QUERY_REC *query, int automatic) } } - signal_emit__query_created(query, GINT_TO_POINTER(automatic)); + SIGNAL_EMIT(query_created, query, GINT_TO_POINTER(automatic)); } void query_destroy(QUERY_REC *query) @@ -71,7 +71,7 @@ void query_destroy(QUERY_REC *query) query->server->queries = g_slist_remove(query->server->queries, query); } - signal_emit__query_destroyed(query); + SIGNAL_EMIT(query_destroyed, query); MODULE_DATA_DEINIT(query); g_free_not_null(query->hilight_color); @@ -137,8 +137,8 @@ void query_change_nick(QUERY_REC *query, const char *nick) g_free(query->visible_name); query->visible_name = g_strdup(nick); - signal_emit__query_nick_changed(query, oldnick); - signal_emit__window_item_name_changed((WI_ITEM_REC *)query); + SIGNAL_EMIT(query_nick_changed, query, oldnick); + SIGNAL_EMIT(window_item_name_changed, (WI_ITEM_REC *)query); g_free(oldnick); } @@ -148,7 +148,7 @@ void query_change_address(QUERY_REC *query, const char *address) g_free_not_null(query->address); query->address = g_strdup(address); - signal_emit__query_address_changed(query); + SIGNAL_EMIT(query_address_changed, query); } void query_change_server(QUERY_REC *query, SERVER_REC *server) @@ -163,7 +163,7 @@ void query_change_server(QUERY_REC *query, SERVER_REC *server) server->queries = g_slist_append(server->queries, query); query->server = server; - signal_emit__query_server_changed(query); + SIGNAL_EMIT(query_server_changed, query); } void queries_init(void) diff --git a/src/core/rawlog.c b/src/core/rawlog.c index 69ac6fd6..288ee86e 100644 --- a/src/core/rawlog.c +++ b/src/core/rawlog.c @@ -74,7 +74,7 @@ static void rawlog_add(RAWLOG_REC *rawlog, char *str) } g_queue_push_tail(rawlog->lines, str); - signal_emit__rawlog(rawlog, str); + SIGNAL_EMIT(rawlog, rawlog, str); } void rawlog_input(RAWLOG_REC *rawlog, const char *str) diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 525e05c0..62b2af23 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -57,7 +57,7 @@ void reconnect_save_status(SERVER_CONNECT_REC *conn, SERVER_REC *server) g_strdup(server->connrec->channels); } - signal_emit__server_reconnect_save_status(conn, server); + SIGNAL_EMIT(server_reconnect_save_status, conn, server); } static void server_reconnect_add(SERVER_CONNECT_REC *conn, @@ -84,7 +84,7 @@ void server_reconnect_destroy(RECONNECT_REC *rec) reconnects = g_slist_remove(reconnects, rec); - signal_emit__server_reconnect_remove(rec); + SIGNAL_EMIT(server_reconnect_remove, rec); server_connect_unref(rec->conn); g_free(rec); @@ -168,7 +168,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info) SERVER_CONNECT_REC *dest; dest = NULL; - signal_emit__server_connect_copy(&dest, src); + SIGNAL_EMIT(server_connect_copy, &dest, src); g_return_val_if_fail(dest != NULL, NULL); server_connect_ref(dest); @@ -416,7 +416,7 @@ static void cmd_reconnect(const char *data, SERVER_REC *server) msg = g_strconcat("* ", *msg == '\0' ? "Reconnecting" : msg, NULL); - signal_emit__command_("disconnect", msg, server, NULL); + SIGNAL_EMIT_(command, "disconnect", msg, server, NULL); g_free(msg); conn->reconnection = TRUE; @@ -447,7 +447,7 @@ static void cmd_reconnect(const char *data, SERVER_REC *server) } if (rec == NULL) { - signal_emit__server_reconnect_not_found(data); + SIGNAL_EMIT(server_reconnect_not_found, data); } else { conn = rec->conn; server_connect_ref(conn); @@ -469,7 +469,7 @@ static void cmd_disconnect(const char *data, SERVER_REC *server) rec = reconnect_find_tag(atoi(data+6)); if (rec == NULL) - signal_emit__server_reconnect_not_found(data); + SIGNAL_EMIT(server_reconnect_not_found, data); else server_reconnect_destroy(rec); signal_stop(); diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 7e35db08..954f4783 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -110,7 +110,7 @@ void server_setup_fill_reconn(SERVER_CONNECT_REC *conn, if (sserver->password != NULL && conn->password == NULL) conn->password = g_strdup(sserver->password); - signal_emit__server_setup_fill_reconn(conn, sserver); + SIGNAL_EMIT(server_setup_fill_reconn, conn, sserver); } static void server_setup_fill(SERVER_CONNECT_REC *conn, @@ -150,7 +150,7 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn, memcpy(conn->own_ip6, source_host_ip6, sizeof(IPADDR)); } - signal_emit__server_setup_fill_connect(conn); + SIGNAL_EMIT(server_setup_fill_connect, conn); } static void server_setup_fill_server(SERVER_CONNECT_REC *conn, @@ -190,7 +190,7 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn, server_setup_fill_reconn(conn, sserver); - signal_emit__server_setup_fill_server(conn, sserver); + SIGNAL_EMIT(server_setup_fill_server, conn, sserver); } static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn, @@ -216,7 +216,7 @@ static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn, &chatnet->own_ip4, &chatnet->own_ip6); } - signal_emit__server_setup_fill_chatnet(conn, chatnet); + SIGNAL_EMIT(server_setup_fill_chatnet, conn, chatnet); } static SERVER_CONNECT_REC * @@ -461,7 +461,7 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node) rec->no_proxy = config_node_get_bool(node, "no_proxy", FALSE); rec->own_host = g_strdup(config_node_get_str(node, "own_host", NULL)); - signal_emit__server_setup_read(rec, node); + SIGNAL_EMIT(server_setup_read, rec, node); setupservers = g_slist_append(setupservers, rec); return rec; @@ -535,7 +535,7 @@ static void server_setup_save(SERVER_SETUP_REC *rec) if (rec->no_proxy) iconfig_node_set_bool(node, "no_proxy", TRUE); - signal_emit__server_setup_saved(rec, node); + SIGNAL_EMIT(server_setup_saved, rec, node); } static void server_setup_remove_config(SERVER_SETUP_REC *rec) @@ -560,7 +560,7 @@ static void server_setup_remove_config(SERVER_SETUP_REC *rec) static void server_setup_destroy(SERVER_SETUP_REC *rec) { setupservers = g_slist_remove(setupservers, rec); - signal_emit__server_setup_destroyed(rec); + SIGNAL_EMIT(server_setup_destroyed, rec); g_free_not_null(rec->own_host); g_free_not_null(rec->own_ip4); @@ -586,7 +586,7 @@ void server_setup_add(SERVER_SETUP_REC *rec) setupservers = g_slist_append(setupservers, rec); server_setup_save(rec); - signal_emit__server_setup_updated(rec); + SIGNAL_EMIT(server_setup_updated, rec); } void server_setup_remove_chatnet(const char *chatnet) diff --git a/src/core/servers.c b/src/core/servers.c index ffa46b6f..c534c302 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -45,7 +45,7 @@ void server_connect_failed(SERVER_REC *server, const char *msg) lookup_servers = g_slist_remove(lookup_servers, server); - signal_emit__server_connect_failed(server, msg); + SIGNAL_EMIT(server_connect_failed, server, msg); if (server->connect_tag != -1) { g_source_remove(server->connect_tag); @@ -144,7 +144,7 @@ void server_connect_finished(SERVER_REC *server) server->connect_time = time(NULL); servers = g_slist_append(servers, server); - signal_emit__server_connected(server); + SIGNAL_EMIT(server_connected, server); } static void server_connect_callback_init(SERVER_REC *server, GIOChannel *handle) @@ -210,7 +210,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip, g_return_if_fail(ip != NULL || unix_socket != NULL); - signal_emit__server_connecting(server, ip); + SIGNAL_EMIT(server_connecting, server, ip); if (server->connrec->no_connect) return; @@ -429,7 +429,7 @@ int server_start_connect(SERVER_REC *server) server->connect_time = time(NULL); lookup_servers = g_slist_append(lookup_servers, server); - signal_emit__server_looking(server); + SIGNAL_EMIT(server_looking, server); } return TRUE; } @@ -477,7 +477,7 @@ void server_disconnect(SERVER_REC *server) servers = g_slist_remove(servers, server); server->disconnected = TRUE; - signal_emit__server_disconnected(server); + SIGNAL_EMIT(server_disconnected, server); /* we used to destroy the handle here but it may be still in use during signal processing, so destroy it on unref @@ -520,7 +520,7 @@ int server_unref(SERVER_REC *server) them know that the object got destroyed if the server was disconnected */ if (server->disconnected) { - signal_emit__server_destroyed(server); + SIGNAL_EMIT(server_destroyed, server); } if (server->handle != NULL) { @@ -660,7 +660,7 @@ void server_change_nick(SERVER_REC *server, const char *nick) g_free(server->nick); server->nick = g_strdup(nick); - signal_emit__server_nick_changed(server); + SIGNAL_EMIT(server_nick_changed, server); } /* Update own IPv4 and IPv6 records */ @@ -705,7 +705,7 @@ SERVER_REC *cmd_options_get_server(const char *cmd, server = server_find_tag(list->data); if (server == NULL || list->next != NULL) { /* unknown option (not server tag) */ - signal_emit__error_command(GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), server == NULL ? list->data : list->next->data); signal_stop(); diff --git a/src/core/session.c b/src/core/session.c index 07206102..6240fd1c 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -75,7 +75,7 @@ static void cmd_upgrade(const char *data) session = config_open(session_file, 0600); unlink(session_file); - signal_emit__session_save(session); + SIGNAL_EMIT(session_save, session); config_write(session, NULL, -1); config_close(session); @@ -88,7 +88,7 @@ static void cmd_upgrade(const char *data) session_args = g_strsplit(str, " ", -1); g_free(str); - signal_emit__gui_exit(); + SIGNAL_EMIT(gui_exit); } static void session_save_nick(CHANNEL_REC *channel, NICK_REC *nick, @@ -103,7 +103,7 @@ static void session_save_nick(CHANNEL_REC *channel, NICK_REC *nick, config_node_set_str(config, node, "prefixes", nick->prefixes); - signal_emit__session_save_nick(channel, nick, config, node); + SIGNAL_EMIT(session_save_nick, channel, nick, config, node); } static void session_save_channel_nicks(CHANNEL_REC *channel, CONFIG_REC *config, @@ -130,7 +130,7 @@ static void session_save_channel(CHANNEL_REC *channel, CONFIG_REC *config, config_node_set_int(config, node, "topic_time", channel->topic_time); config_node_set_str(config, node, "key", channel->key); - signal_emit__session_save_channel(channel, config, node); + SIGNAL_EMIT(session_save_channel, channel, config, node); } static void session_save_server_channels(SERVER_REC *server, @@ -173,7 +173,7 @@ static void session_save_server(SERVER_REC *server, CONFIG_REC *config, handle = g_io_channel_unix_get_fd(net_sendbuffer_handle(server->handle)); config_node_set_int(config, node, "handle", handle); - signal_emit__session_save_server(server, config, node); + SIGNAL_EMIT(session_save_server, server, config, node); /* fake the server disconnection */ g_io_channel_unref(net_sendbuffer_handle(server->handle)); @@ -195,7 +195,7 @@ static void session_restore_channel_nicks(CHANNEL_REC *channel, if (node != NULL && node->type == NODE_TYPE_LIST) { tmp = config_node_first(node->value); for (; tmp != NULL; tmp = config_node_next(tmp)) { - signal_emit__session_restore_nick(channel, tmp->data); + SIGNAL_EMIT(session_restore_nick, channel, tmp->data); } } } @@ -217,7 +217,7 @@ static void session_restore_channel(SERVER_REC *server, CONFIG_NODE *node) channel->key = g_strdup(config_node_get_str(node, "key", NULL)); channel->session_rejoin = TRUE; - signal_emit__session_restore_channel(channel, node); + SIGNAL_EMIT(session_restore_channel, channel, node); } static void session_restore_server_channels(SERVER_REC *server, @@ -268,7 +268,7 @@ static void session_restore_server(CONFIG_NODE *node) server = proto->server_init_connect(conn); server->version = g_strdup(config_node_get_str(node, "version", NULL)); server->session_reconnect = TRUE; - signal_emit__session_restore_server(server, node); + SIGNAL_EMIT(session_restore_server, server, node); proto->server_connect(server); } @@ -326,7 +326,7 @@ static void sig_init_finished(void) return; config_parse(session); - signal_emit__session_restore(session); + SIGNAL_EMIT(session_restore, session); config_close(session); unlink(session_file); diff --git a/src/core/settings.c b/src/core/settings.c index 2f5313c1..bc826ba6 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -476,7 +476,7 @@ static void sig_init_finished(void) { fe_initialized = TRUE; if (last_errors != NULL) { - signal_emit__settings_errors(last_errors->str); + SIGNAL_EMIT(settings_errors, last_errors->str); g_string_free(last_errors, TRUE); } @@ -485,10 +485,10 @@ static void sig_init_finished(void) config file, reload it */ g_warning("Some settings were automatically " "updated, please /SAVE"); - signal_emit__setup_changed(); + SIGNAL_EMIT(setup_changed); } - signal_emit__settings_userinfo_changed(GUINT_TO_POINTER(user_settings_changed)); + SIGNAL_EMIT(settings_userinfo_changed, GUINT_TO_POINTER(user_settings_changed)); } static void settings_clean_invalid_module(const char *module) @@ -615,7 +615,7 @@ void settings_check_module(const char *module) g_strdup(module)); } if (fe_initialized) - signal_emit__settings_errors(errors->str); + SIGNAL_EMIT(settings_errors, errors->str); else { if (last_errors == NULL) last_errors = g_string_new(NULL); @@ -657,7 +657,7 @@ void sig_term(int n) signal(SIGTERM, SIG_DFL); /* quit from all servers too.. */ - signal_emit__command_("quit", "", NULL, NULL); + SIGNAL_EMIT_(command, "quit", "", NULL, NULL); /* and die */ raise(SIGTERM); @@ -740,7 +740,7 @@ static CONFIG_REC *parse_configfile(const char *fname) if (config == NULL) { str = g_strdup_printf("Error opening configuration file %s: %s", path, g_strerror(errno)); - signal_emit__gui_dialog("error", str); + SIGNAL_EMIT(gui_dialog, "error", str); g_free(str); config = config_open(NULL, -1); @@ -780,7 +780,7 @@ static void init_configfile(void) if (config_last_error(mainconfig) != NULL) { str = g_strdup_printf("Ignored errors in configuration file:\n%s", config_last_error(mainconfig)); - signal_emit__gui_dialog("error", str); + SIGNAL_EMIT(gui_dialog, "error", str); g_free(str); } @@ -797,14 +797,14 @@ int settings_reread(const char *fname) g_free_not_null(str); if (tempconfig == NULL) { - signal_emit__gui_dialog("error", g_strerror(errno)); + SIGNAL_EMIT(gui_dialog, "error", g_strerror(errno)); return FALSE; } if (config_last_error(tempconfig) != NULL) { str = g_strdup_printf("Errors in configuration file:\n%s", config_last_error(tempconfig)); - signal_emit__gui_dialog("error", str); + SIGNAL_EMIT(gui_dialog, "error", str); g_free(str); config_close(tempconfig); @@ -815,8 +815,8 @@ int settings_reread(const char *fname) mainconfig = tempconfig; config_last_modifycounter = mainconfig->modifycounter; - signal_emit__setup_changed(); - signal_emit__setup_reread(mainconfig->fname); + SIGNAL_EMIT(setup_changed); + SIGNAL_EMIT(setup_reread, mainconfig->fname); return TRUE; } @@ -834,10 +834,10 @@ int settings_save(const char *fname, int autosave) if (error) { str = g_strdup_printf("Couldn't save configuration file: %s", config_last_error(mainconfig)); - signal_emit__gui_dialog("error", str); + SIGNAL_EMIT(gui_dialog, "error", str); g_free(str); } - signal_emit__setup_saved(fname, GINT_TO_POINTER(autosave)); + SIGNAL_EMIT(setup_saved, fname, GINT_TO_POINTER(autosave)); return !error; } @@ -858,7 +858,7 @@ static int sig_autosave(void) "configuration to file '%s' instead. " "Use /SAVE or /RELOAD to get rid of " "this message.", fname); - signal_emit__gui_dialog("warning", str); + SIGNAL_EMIT(gui_dialog, "warning", str); g_free(str); settings_save(fname, TRUE); diff --git a/src/core/special-vars.c b/src/core/special-vars.c index a79bde40..88205d42 100644 --- a/src/core/special-vars.c +++ b/src/core/special-vars.c @@ -610,7 +610,7 @@ void eval_special_string(const char *cmd, const char *data, if (server != NULL) server_ref(server); - signal_emit__send_command(ret, server, item); + SIGNAL_EMIT(send_command, ret, server, item); if (server != NULL && !server_unref(server)) { /* the server was destroyed */ diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c index 2be7c1d3..42a6dd0b 100644 --- a/src/fe-common/core/chat-completion.c +++ b/src/fe-common/core/chat-completion.c @@ -1181,7 +1181,7 @@ static void event_text(const char *data, SERVER_REC *server, WI_ITEM_REC *item) target, line); g_free(target); - signal_emit__command_("msg", str, server, item); + SIGNAL_EMIT_(command, "msg", str, server, item); g_free(str); g_free(line); diff --git a/src/fe-common/core/completion.c b/src/fe-common/core/completion.c index f13b134f..415c9734 100644 --- a/src/fe-common/core/completion.c +++ b/src/fe-common/core/completion.c @@ -213,7 +213,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i } if (erase) { - signal_emit__complete_erase(window, word, linestart); + SIGNAL_EMIT(complete_erase, window, word, linestart); /* jump to next completion */ startpos = old_startpos; @@ -234,7 +234,7 @@ char *word_complete(WINDOW_REC *window, const char *line, int *pos, int erase, i free_completions(); want_space = TRUE; - signal_emit__complete_word(&complist, window, word, linestart, &want_space); + SIGNAL_EMIT(complete_word, &complist, window, word, linestart, &want_space); last_want_space = want_space; if (complist != NULL) { @@ -682,7 +682,7 @@ static void sig_complete_word(GList **list, WINDOW_REC *window, /* complete parameters */ signal = g_strconcat("complete command ", cmd, NULL); - signal_emit__complete_command_(cmd, list, window, word, args, want_space); + SIGNAL_EMIT_(complete_command, cmd, list, window, word, args, want_space); if (command_have_sub(line)) { /* complete subcommand */ @@ -723,7 +723,7 @@ static void sig_complete_erase(WINDOW_REC *window, const char *word, } signal = g_strconcat("complete erase command ", cmd, NULL); - signal_emit__complete_erase_command_(cmd, window, word, args); + SIGNAL_EMIT_(complete_erase_command, cmd, window, word, args); g_free(signal); g_free(cmd); @@ -851,7 +851,7 @@ static void cmd_completion(const char *data) TXT_COMPLETION_REMOVED, key); iconfig_set_str("completions", key, NULL); - signal_emit__completion_removed(key); + SIGNAL_EMIT(completion_removed, key); } else if (*key != '\0' && *value != '\0') { int automatic = g_hash_table_lookup(optlist, "auto") != NULL; @@ -866,7 +866,7 @@ static void cmd_completion(const char *data) TXT_COMPLETION_LINE, key, value, automatic ? "yes" : "no"); - signal_emit__completion_added(key); + SIGNAL_EMIT(completion_added, key); } else { printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_COMPLETION_HEADER); diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index f5eef4fe..bc0de955 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -241,7 +241,7 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (*data == '\0') cmd_channel_list_joined(); else if (server != NULL && server_ischannel(server, data)) { - signal_emit__command_("join", data, server, item); + SIGNAL_EMIT_(command, "join", data, server, item); } else { command_runsub("channel", data, server, item); } @@ -297,7 +297,7 @@ static void cmd_channel_add_modify(const char *data, gboolean add) if (botcmdarg != NULL && *botcmdarg != '\0') rec->autosendcmd = g_strdup(botcmdarg); if (*password != '\0' && g_strcmp0(password, "-") != 0) rec->password = g_strdup(password); - signal_emit__channel_add_fill(rec, optlist); + SIGNAL_EMIT(channel_add_fill, rec, optlist); channel_setup_create(rec); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, @@ -577,7 +577,7 @@ static void cmd_names(const char *data, SERVER_REC *server, WI_ITEM_REC *item) g_string_truncate(unknowns, unknowns->len-1); if (unknowns->len > 0 && g_strcmp0(channel, unknowns->str) != 0) - signal_emit__command_("names", unknowns->str, server, item); + SIGNAL_EMIT_(command, "names", unknowns->str, server, item); g_string_free(unknowns, TRUE); cmd_params_free(free_arg); @@ -607,7 +607,7 @@ static void cmd_cycle(const char *data, SERVER_REC *server, WI_ITEM_REC *item) chanrec->server->tag, chanrec->name); /* FIXME: kludgy kludgy... */ - signal_emit__command_("part", data, server, item); + SIGNAL_EMIT_(command, "part", data, server, item); if (g_slist_find(channels, chanrec) != NULL) { chanrec->left = TRUE; diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index d5deaeea..a79a30f1 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -342,7 +342,7 @@ static void autoconnect_servers(void) else str = g_strdup_printf("%s %d %s", autocon_server, autocon_port, autocon_password); - signal_emit__command_("connect", str, NULL, NULL); + SIGNAL_EMIT_(command, "connect", str, NULL, NULL); g_free(str); return; } @@ -367,7 +367,7 @@ static void autoconnect_servers(void) str = g_strdup_printf("%s %d", rec->address, rec->port); } - signal_emit__command_("connect", str, NULL, NULL); + SIGNAL_EMIT_(command, "connect", str, NULL, NULL); g_free(str); } } @@ -438,7 +438,7 @@ void fe_common_core_finish_init(void) { int setup_changed; - signal_emit__irssi_init_read_settings(); + SIGNAL_EMIT(irssi_init_read_settings); #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); @@ -464,7 +464,7 @@ void fe_common_core_finish_init(void) g_log_set_default_handler((GLogFunc) glog_func, NULL); if (setup_changed) - signal_emit__setup_changed(); + SIGNAL_EMIT(setup_changed); autorun_startup(); autoconnect_servers(); diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c index 4d810001..99b6e728 100644 --- a/src/fe-common/core/fe-core-commands.c +++ b/src/fe-common/core/fe-core-commands.c @@ -170,7 +170,7 @@ static void cmd_cat(const char *data) /* SYNTAX: BEEP */ static void cmd_beep(void) { - signal_emit__beep(); + SIGNAL_EMIT(beep); } static void cmd_nick(const char *data, SERVER_REC *server) @@ -259,7 +259,7 @@ static void event_default_command(const char *data, void *server, /* command character inside command .. we probably want to send this text to channel. for example when pasting a path /usr/bin/xxx. */ - signal_emit__send_text(current_cmdline, server, item); + SIGNAL_EMIT(send_text, current_cmdline, server, item); return; } ptr++; @@ -269,7 +269,7 @@ static void event_default_command(const char *data, void *server, last line */ diff = get_timeval_diff(&time_command_now, &time_command_last); if (item != NULL && !last_command_cmd && diff < PASTE_CHECK_SPEED) { - signal_emit__send_text(current_cmdline, active_win->active_server, active_win->active); + SIGNAL_EMIT(send_text, current_cmdline, active_win->active_server, active_win->active); command_cmd = FALSE; return; } @@ -279,7 +279,7 @@ static void event_default_command(const char *data, void *server, p = strchr(cmd, ' '); if (p != NULL) *p = '\0'; - signal_emit__error_command(GINT_TO_POINTER(CMDERR_UNKNOWN), cmd); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_UNKNOWN), cmd); g_free(cmd); } diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c index dfb31325..a2ecaa3f 100644 --- a/src/fe-common/core/fe-exec.c +++ b/src/fe-common/core/fe-exec.c @@ -179,7 +179,7 @@ static void process_destroy(PROCESS_REC *rec, int status) { processes = g_slist_remove(processes, rec); - signal_emit__exec_remove(rec, GINT_TO_POINTER(status)); + SIGNAL_EMIT(exec_remove, rec, GINT_TO_POINTER(status)); if (rec->read_tag != -1) g_source_remove(rec->read_tag); @@ -258,7 +258,7 @@ static int cmd_options_get_signal(const char *cmd, if (signum == -1 || list->next != NULL) { /* unknown option (not a signal) */ - signal_emit__error_command(GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), signum == -1 ? list->data : list->next->data); signal_stop(); return -2; @@ -370,7 +370,7 @@ static void sig_exec_input_reader(PROCESS_REC *rec) } if (ret > 0) { - signal_emit__exec_input(rec, str); + SIGNAL_EMIT(exec_input, rec, str); if (recvlen > 0) recvlen = 0; } } while (ret > 0); @@ -531,7 +531,7 @@ static void handle_exec(const char *args, GHashTable *optlist, if (rec->target == NULL && interactive) rec->target_item = exec_wi_create(active_win, rec); - signal_emit__exec_new(rec); + SIGNAL_EMIT(exec_new, rec); } /* SYNTAX: EXEC [-] [-nosh] [-out | -msg | -notice ] @@ -567,7 +567,7 @@ static void sig_pidwait(void *pid, void *statusp) /* process exited - print the last line if there wasn't a newline at end. */ if (line_split("\n", 1, &str, &rec->databuf) > 0 && *str != '\0') - signal_emit__exec_input(rec, str); + SIGNAL_EMIT(exec_input, rec, str); if (!rec->silent) { if (WIFSIGNALED(status)) { @@ -615,7 +615,7 @@ static void sig_exec_input(PROCESS_REC *rec, const char *text) str = g_strconcat(rec->target_nick ? "-nick " : rec->target_channel ? "-channel " : "", rec->target, " ", *text == '\0' ? " " : text, NULL); - signal_emit__command_(rec->notice ? "notice" : "msg", + SIGNAL_EMIT_(command, rec->notice ? "notice" : "msg", str, server, item); g_free(str); } else if (rec->target_item != NULL) { diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c index 31b501ed..5f8d0c93 100644 --- a/src/fe-common/core/fe-log.c +++ b/src/fe-common/core/fe-log.c @@ -675,7 +675,7 @@ static void sig_awaylog_show(LOG_REC *log, gpointer pmsgs, gpointer pfilepos) printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_LOG_AWAY_MSGS, log->real_fname, msgs); str = g_strdup_printf("\"%s\" %d", log->real_fname, filepos); - signal_emit__command_("cat", str, NULL, NULL); + SIGNAL_EMIT_(command, "cat", str, NULL, NULL); g_free(str); } } diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c index 5863b93d..3489192b 100644 --- a/src/fe-common/core/fe-queries.c +++ b/src/fe-common/core/fe-queries.c @@ -135,7 +135,7 @@ static void signal_query_nick_changed(QUERY_REC *query, const char *oldnick) query->address == NULL ? "" : query->address); } - signal_emit__window_item_changed(window_item_window((WI_ITEM_REC *) query), (WI_ITEM_REC *)query); + SIGNAL_EMIT(window_item_changed, window_item_window((WI_ITEM_REC *) query), (WI_ITEM_REC *)query); } static void signal_window_item_server_changed(WINDOW_REC *window, @@ -274,7 +274,7 @@ static void cmd_query(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (*msg != '\0') { msg = g_strdup_printf("-nick %s %s", nick, msg); - signal_emit__command_("msg", msg, server, (WI_ITEM_REC *)query); + SIGNAL_EMIT_(command, "msg", msg, server, (WI_ITEM_REC *)query); g_free(msg); } diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c index 229f9741..31b2b0cb 100644 --- a/src/fe-common/core/fe-recode.c +++ b/src/fe-common/core/fe-recode.c @@ -108,7 +108,7 @@ static void fe_recode_add_cmd (const char *data, SERVER_REC *server, WI_ITEM_REC iconfig_set_str("conversions", target, charset); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_CONVERSION_ADDED, target, charset); } else - signal_emit__error_command(GINT_TO_POINTER(CMDERR_INVALID_CHARSET), charset); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), charset); end: cmd_params_free(free_arg); } @@ -159,7 +159,7 @@ static void read_settings(void) g_free(recode_fallback); recode_fallback = g_strdup(settings_get_str("recode_fallback")); if (!is_valid_charset(recode_fallback)) { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_fallback); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_fallback); g_free(recode_fallback); recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : NULL; settings_set_str("recode_fallback", recode_fallback); @@ -180,7 +180,7 @@ static void read_settings(void) recode_out_default = g_strdup(settings_get_str("recode_out_default_charset")); if (recode_out_default != NULL && *recode_out_default != '\0' && !is_valid_charset(recode_out_default)) { - signal_emit__error_command(GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_out_default); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_out_default); g_free(recode_out_default); recode_out_default = is_valid_charset(old_recode_out_default) ? g_strdup(old_recode_out_default) : NULL; settings_set_str("recode_out_default_charset", recode_out_default); diff --git a/src/fe-common/core/fe-server.c b/src/fe-common/core/fe-server.c index eff76c5a..ec6b43ff 100644 --- a/src/fe-common/core/fe-server.c +++ b/src/fe-common/core/fe-server.c @@ -248,7 +248,7 @@ static void cmd_server_add_modify(const char *data, gboolean add) rec->own_ip4 = rec->own_ip6 = NULL; } - signal_emit__server_add_fill(rec, optlist); + SIGNAL_EMIT(server_add_fill, rec, optlist); server_setup_add(rec); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c index 941ef981..a2e3b8d2 100644 --- a/src/fe-common/core/fe-settings.c +++ b/src/fe-common/core/fe-settings.c @@ -198,7 +198,7 @@ static void cmd_set(char *data) /* Unpossible! */ break; } - signal_emit__setup_changed(); + SIGNAL_EMIT(setup_changed); printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, TXT_SET_TITLE, rec->section); set_print(rec); } else @@ -229,7 +229,7 @@ static void cmd_toggle(const char *data) else { set_boolean(key, *value != '\0' ? value : "TOGGLE"); set_print(settings_get_record(key)); - signal_emit__setup_changed(); + SIGNAL_EMIT(setup_changed); } cmd_params_free(free_arg); @@ -286,7 +286,7 @@ static void alias_remove(const char *alias) printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_ALIAS_REMOVED, alias); iconfig_set_str("aliases", alias, NULL); - signal_emit__alias_removed(alias); + SIGNAL_EMIT(alias_removed, alias); } } @@ -308,7 +308,7 @@ static void cmd_alias(const char *data) else { printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_ALIAS_ADDED, alias); iconfig_set_str("aliases", alias, value); - signal_emit__alias_added(alias, value); + SIGNAL_EMIT(alias_added, alias, value); } cmd_params_free(free_arg); } diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c index c60ce04c..8a56a973 100644 --- a/src/fe-common/core/fe-windows.c +++ b/src/fe-common/core/fe-windows.c @@ -128,12 +128,12 @@ WINDOW_REC *window_create(WI_ITEM_REC *item, int automatic) windows = g_slist_prepend(windows, rec); windows_seq_insert(rec); - signal_emit__window_created(rec, GINT_TO_POINTER(automatic)); + SIGNAL_EMIT(window_created, rec, GINT_TO_POINTER(automatic)); if (item != NULL) window_item_add(rec, item, automatic); if (windows->next == NULL || !automatic || settings_get_bool("window_auto_change")) { if (automatic && windows->next != NULL) - signal_emit__window_changed_automatic(rec); + SIGNAL_EMIT(window_changed_automatic, rec); window_set_active(rec); } return rec; @@ -149,7 +149,7 @@ static void window_set_refnum0(WINDOW_REC *window, int refnum) old_refnum = window->refnum; window->refnum = refnum; - signal_emit__window_refnum_changed(window, GINT_TO_POINTER(old_refnum)); + SIGNAL_EMIT(window_refnum_changed, window, GINT_TO_POINTER(old_refnum)); } /* removed_refnum was removed from the windows list, pack the windows so @@ -203,7 +203,7 @@ void window_destroy(WINDOW_REC *window) if (settings_get_bool("windows_auto_renumber")) windows_pack(window->refnum); - signal_emit__window_destroyed(window); + SIGNAL_EMIT(window_destroyed, window); while (window->bound_items != NULL) window_bind_destroy(window, window->bound_items->data); @@ -238,7 +238,7 @@ void window_set_active(WINDOW_REC *window) } if (active_win != NULL) - signal_emit__window_changed(active_win, old_window); + SIGNAL_EMIT(window_changed, active_win, old_window); } void window_change_server(WINDOW_REC *window, void *server) @@ -260,12 +260,12 @@ void window_change_server(WINDOW_REC *window, void *server) if (window->connect_server != connect) { window->connect_server = connect; - signal_emit__window_connect_changed(window, connect); + SIGNAL_EMIT(window_connect_changed, window, connect); } if (window->active_server != active) { window->active_server = active; - signal_emit__window_server_changed(window, active); + SIGNAL_EMIT(window_server_changed, window, active); } } @@ -285,12 +285,12 @@ void window_set_refnum(WINDOW_REC *window, int refnum) WINDOW_REC *rec = g_sequence_get(other_iter); rec->refnum = window->refnum; - signal_emit__window_refnum_changed(rec, GINT_TO_POINTER(refnum)); + SIGNAL_EMIT(window_refnum_changed, rec, GINT_TO_POINTER(refnum)); } old_refnum = window->refnum; window->refnum = refnum; - signal_emit__window_refnum_changed(window, GINT_TO_POINTER(old_refnum)); + SIGNAL_EMIT(window_refnum_changed, window, GINT_TO_POINTER(old_refnum)); if (window_iter != NULL && other_iter != NULL) { g_sequence_swap(other_iter, window_iter); @@ -304,7 +304,7 @@ void window_set_name(WINDOW_REC *window, const char *name) g_free_not_null(window->name); window->name = name == NULL || *name == '\0' ? NULL : g_strdup(name); - signal_emit__window_name_changed(window); + SIGNAL_EMIT(window_name_changed, window); } void window_set_history(WINDOW_REC *window, const char *name) @@ -317,14 +317,14 @@ void window_set_history(WINDOW_REC *window, const char *name) else window->history_name = g_strdup(name); - signal_emit__window_history_changed(window, oldname); + SIGNAL_EMIT(window_history_changed, window, oldname); g_free_not_null(oldname); } void window_clear_history(WINDOW_REC *window, const char *name) { - signal_emit__window_history_cleared(window, name); + SIGNAL_EMIT(window_history_cleared, window, name); } void window_set_level(WINDOW_REC *window, int level) @@ -332,7 +332,7 @@ void window_set_level(WINDOW_REC *window, int level) g_return_if_fail(window != NULL); window->level = level; - signal_emit__window_level_changed(window); + SIGNAL_EMIT(window_level_changed, window); } void window_set_immortal(WINDOW_REC *window, int immortal) @@ -340,7 +340,7 @@ void window_set_immortal(WINDOW_REC *window, int immortal) g_return_if_fail(window != NULL); window->immortal = immortal; - signal_emit__window_immortal_changed(window); + SIGNAL_EMIT(window_immortal_changed, window); } /* return active item's name, or if none is active, window's name */ diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 1e6b7def..53b4499b 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -854,7 +854,7 @@ void format_newline(WINDOW_REC *window) { g_return_if_fail(window != NULL); - signal_emit__gui_print_text(window, + SIGNAL_EMIT(gui_print_text, window, GINT_TO_POINTER(-1), GINT_TO_POINTER(-1), GINT_TO_POINTER(GUI_PRINT_FLAG_NEWLINE), "", NULL); @@ -1239,7 +1239,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) if (*str == '\0') { /* empty line, write line info only */ - signal_emit__gui_print_text(dest->window, GINT_TO_POINTER(fgcolor), + SIGNAL_EMIT(gui_print_text, dest->window, GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, dest); } @@ -1260,7 +1260,7 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) if (*str != '\0' || (flags & GUI_PRINT_FLAG_CLRTOEOL)) { /* send the text to gui handler */ - signal_emit__gui_print_text(dest->window, + SIGNAL_EMIT(gui_print_text, dest->window, GINT_TO_POINTER(fgcolor), GINT_TO_POINTER(bgcolor), GINT_TO_POINTER(flags), str, diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 9bc6670a..16febb6a 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -140,7 +140,7 @@ void hilight_create(HILIGHT_REC *rec) hilight_init_rec(rec); - signal_emit__hilight_created(rec); + SIGNAL_EMIT(hilight_created, rec); } void hilight_remove(HILIGHT_REC *rec) @@ -150,7 +150,7 @@ void hilight_remove(HILIGHT_REC *rec) hilight_remove_config(rec); hilights = g_slist_remove(hilights, rec); - signal_emit__hilight_destroyed(rec); + SIGNAL_EMIT(hilight_destroyed, rec); hilight_destroy(rec); } @@ -403,7 +403,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text, g_string_free(tmp, FALSE); } - signal_emit__print_text(dest, newstr, stripped); + SIGNAL_EMIT(print_text, dest, newstr, stripped); g_free(color); g_free(newstr); diff --git a/src/fe-common/core/keyboard.c b/src/fe-common/core/keyboard.c index 2265fcf7..c82e7e90 100644 --- a/src/fe-common/core/keyboard.c +++ b/src/fe-common/core/keyboard.c @@ -66,7 +66,7 @@ KEYBOARD_REC *keyboard_create(void *data) rec->gui_data = data; rec->timer_tag = 0; - signal_emit__keyboard_created(rec); + SIGNAL_EMIT(keyboard_created, rec); return rec; } @@ -78,7 +78,7 @@ void keyboard_destroy(KEYBOARD_REC *keyboard) keyboard->timer_tag = 0; } - signal_emit__keyboard_destroyed(keyboard); + SIGNAL_EMIT(keyboard_destroyed, keyboard); g_free_not_null(keyboard->key_state); g_free(keyboard); @@ -445,7 +445,7 @@ static void key_configure_destroy(KEY_REC *rec) rec->info->keys = g_slist_remove(rec->info->keys, rec); g_hash_table_remove(keys, rec->key); - signal_emit__key_destroyed(rec); + SIGNAL_EMIT(key_destroyed, rec); if (!key_config_frozen) key_states_rescan(); @@ -480,7 +480,7 @@ static void key_configure_create(const char *id, const char *key, info->keys = g_slist_append(info->keys, rec); g_hash_table_insert(keys, rec->key, rec); - signal_emit__key_created(rec); + SIGNAL_EMIT(key_created, rec); if (!key_config_frozen) key_states_rescan(); @@ -512,7 +512,7 @@ void key_bind(const char *id, const char *description, signal_add(key, func); g_free(key); - signal_emit__keyinfo_created(info); + SIGNAL_EMIT(keyinfo_created, info); } if (key_default != NULL && *key_default != '\0') { @@ -526,7 +526,7 @@ static void keyinfo_remove(KEYINFO_REC *info) g_return_if_fail(info != NULL); keyinfos = g_slist_remove(keyinfos, info); - signal_emit__keyinfo_destroyed(info); + SIGNAL_EMIT(keyinfo_destroyed, info); /* destroy all keys */ g_slist_foreach(info->keys, (GFunc) key_destroy, keys); @@ -615,7 +615,7 @@ static int key_emit_signal(KEYBOARD_REC *keyboard, KEY_REC *key) char *str; str = g_strconcat("key ", key->info->id, NULL); - consumed = signal_emit__key_(key->info->id, key->data, keyboard->gui_data, key->info); + consumed = SIGNAL_EMIT_(key, key->info->id, key->data, keyboard->gui_data, key->info); g_free(str); return consumed; @@ -711,7 +711,7 @@ int key_pressed(KEYBOARD_REC *keyboard, const char *key) void keyboard_entry_redirect(SIGNAL_FUNC func, const char *entry, int flags, void *data) { - signal_emit__gui_entry_redirect(func, entry, + SIGNAL_EMIT(gui_entry_redirect, func, entry, GINT_TO_POINTER(flags), data); } @@ -724,7 +724,7 @@ static void sig_command(const char *data) str = strchr(cmdchars, *data) != NULL ? g_strdup(data) : g_strdup_printf("%c%s", *cmdchars, data); - signal_emit__send_command(str, active_win->active_server, active_win->active); + SIGNAL_EMIT(send_command, str, active_win->active_server, active_win->active); g_free(str); } @@ -747,7 +747,7 @@ static void sig_multi(const char *data, void *gui_data) info = key_info_find(*tmp); if (info != NULL) { str = g_strconcat("key ", info->id, NULL); - signal_emit__key_(info->id, p, gui_data, info); + SIGNAL_EMIT_(key, info->id, p, gui_data, info); g_free(str); } } diff --git a/src/fe-common/core/printtext.c b/src/fe-common/core/printtext.c index 33e55b88..03fdeac4 100644 --- a/src/fe-common/core/printtext.c +++ b/src/fe-common/core/printtext.c @@ -69,11 +69,11 @@ void printformat_module_dest_charargs(const char *module, TEXT_DEST_REC *dest, if (!sending_print_starting) { sending_print_starting = TRUE; - signal_emit__print_starting(dest); + SIGNAL_EMIT(print_starting, dest); sending_print_starting = FALSE; } - signal_emit__print_format(theme, module, + SIGNAL_EMIT(print_format, theme, module, dest, GINT_TO_POINTER(formatnum), arglist); str = format_get_text_theme_charargs(theme, module, dest, @@ -180,7 +180,7 @@ static void print_line(TEXT_DEST_REC *dest, const char *text) /* send both the formatted + stripped (for logging etc.) */ stripped = strip_codes(str); - signal_emit__print_text(dest, str, stripped); + SIGNAL_EMIT(print_text, dest, str, stripped); g_free_and_null(dest->hilight_color); g_free(str); @@ -309,7 +309,7 @@ static void printtext_dest_args(TEXT_DEST_REC *dest, const char *text, va_list v if (!sending_print_starting) { sending_print_starting = TRUE; - signal_emit__print_starting(dest); + SIGNAL_EMIT(print_starting, dest); sending_print_starting = FALSE; } @@ -354,7 +354,7 @@ void printtext_string(void *server, const char *target, int level, const char *t if (!sending_print_starting) { sending_print_starting = TRUE; - signal_emit__print_starting(&dest); + SIGNAL_EMIT(print_starting, &dest); sending_print_starting = FALSE; } @@ -376,7 +376,7 @@ void printtext_string_window(WINDOW_REC *window, int level, const char *text) if (!sending_print_starting) { sending_print_starting = TRUE; - signal_emit__print_starting(&dest); + SIGNAL_EMIT(print_starting, &dest); sending_print_starting = FALSE; } @@ -433,7 +433,7 @@ static void msg_beep_check(TEXT_DEST_REC *dest) (beep_when_away || (dest->server != NULL && !dest->server->usermode_away)) && (beep_when_window_active || dest->window != active_win)) { - signal_emit__beep(); + SIGNAL_EMIT(beep); } } @@ -471,7 +471,7 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text) format_send_to_gui(dest, str); g_free(str); - signal_emit__gui_print_text_finished(dest->window); + SIGNAL_EMIT(gui_print_text_finished, dest->window); } void printtext_multiline(void *server, const char *target, int level, diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index 67e98efc..d7ef4459 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -60,7 +60,7 @@ THEME_REC *theme_create(const char *path, const char *name) rec->modules = g_hash_table_new((GHashFunc) g_istr_hash, (GCompareFunc) g_istr_equal); themes = g_slist_append(themes, rec); - signal_emit__theme_created(rec); + SIGNAL_EMIT(theme_created, rec); return rec; } @@ -110,7 +110,7 @@ static void theme_unref(THEME_REC *rec) void theme_destroy(THEME_REC *rec) { themes = g_slist_remove(themes, rec); - signal_emit__theme_destroyed(rec); + SIGNAL_EMIT(theme_destroyed, rec); theme_unref(rec); } @@ -811,7 +811,7 @@ static void sig_print_errors(void) init_finished = TRUE; if (init_errors != NULL) { - signal_emit__gui_dialog("error", init_errors); + SIGNAL_EMIT(gui_dialog, "error", init_errors); g_free(init_errors); } } @@ -1368,7 +1368,7 @@ static void change_theme(const char *name, int verbose) rec = theme_load(name); if (rec != NULL) { current_theme = rec; - signal_emit__theme_changed(rec); + SIGNAL_EMIT(theme_changed, rec); if (verbose) { printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, diff --git a/src/fe-common/core/window-activity.c b/src/fe-common/core/window-activity.c index bafd70b4..d68a25d5 100644 --- a/src/fe-common/core/window-activity.c +++ b/src/fe-common/core/window-activity.c @@ -47,10 +47,10 @@ void window_activity(WINDOW_REC *window, int data_level, window->data_level = data_level; g_free_not_null(window->hilight_color); window->hilight_color = g_strdup(hilight_color); - signal_emit__window_hilight(window); + SIGNAL_EMIT(window_hilight, window); } - signal_emit__window_activity(window, + SIGNAL_EMIT(window_activity, window, GINT_TO_POINTER(old_data_level)); } @@ -64,10 +64,10 @@ void window_item_activity(WI_ITEM_REC *item, int data_level, item->data_level = data_level; g_free_not_null(item->hilight_color); item->hilight_color = g_strdup(hilight_color); - signal_emit__window_item_hilight(item); + SIGNAL_EMIT(window_item_hilight, item); } - signal_emit__window_item_activity(item, + SIGNAL_EMIT(window_item_activity, item, GINT_TO_POINTER(old_data_level)); } @@ -94,7 +94,7 @@ static void sig_hilight_text(TEXT_DEST_REC *dest, const char *msg) } /* we should ask the text view if this line is hidden */ - signal_emit__window_hilight_check(dest, msg, &data_level, &cb_ignore); + SIGNAL_EMIT(window_hilight_check, dest, msg, &data_level, &cb_ignore); if (cb_ignore) { return; } diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c index cef9dc02..58719b3e 100644 --- a/src/fe-common/core/window-commands.c +++ b/src/fe-common/core/window-commands.c @@ -153,7 +153,7 @@ static void cmd_window_info(WINDOW_REC *win) if (win->items != NULL) window_print_items(win); - signal_emit__window_print_info(win); + SIGNAL_EMIT(window_print_info, win); printformat_window(win, MSGLEVEL_CLIENTCRAP, TXT_WINDOW_INFO_FOOTER); @@ -166,7 +166,7 @@ static void cmd_window(const char *data, void *server, WI_ITEM_REC *item) if (*data == '\0') cmd_window_info(active_win); else if (is_numeric(data, 0)) - signal_emit__command_("window refnum", data, server, item); + SIGNAL_EMIT_(command, "window refnum", data, server, item); else command_runsub("window", data, server, item); } @@ -182,7 +182,7 @@ static void cmd_window_new(const char *data, void *server, WI_ITEM_REC *item) type = (g_ascii_strncasecmp(data, "hid", 3) == 0 || g_ascii_strcasecmp(data, "tab") == 0) ? MAIN_WINDOW_TYPE_HIDDEN : g_ascii_strcasecmp(data, "split") == 0 ? MAIN_WINDOW_TYPE_SPLIT : g_ascii_strncasecmp(data, "rs", 2) == 0 ? MAIN_WINDOW_TYPE_RSPLIT : MAIN_WINDOW_TYPE_DEFAULT; - signal_emit__gui_window_create_override(GINT_TO_POINTER(type)); + SIGNAL_EMIT(gui_window_create_override, GINT_TO_POINTER(type)); window = window_create(NULL, FALSE); window_change_server(window, server); @@ -509,7 +509,7 @@ static void cmd_window_item(const char *data, void *server, WI_ITEM_REC *item) while (*data == ' ') data++; if (is_numeric(data, '\0')) - signal_emit__command_("window item goto", data, server, item); + SIGNAL_EMIT_(command, "window item goto", data, server, item); else command_runsub("window item", data, server, item); } @@ -858,7 +858,7 @@ static void cmd_foreach_window(const char *data) WINDOW_REC *rec = list->data; active_win = rec; - signal_emit__send_command(str, rec->active_server, + SIGNAL_EMIT(send_command, str, rec->active_server, rec->active); list = g_slist_remove(list, list->data); } @@ -875,7 +875,7 @@ static void cmd_window_default_command(const char *data, SERVER_REC *server, WI_ !settings_get_bool("window_number_commands")) { return; } - signal_emit__command_("window refnum", data, server, item); + SIGNAL_EMIT_(command, "window refnum", data, server, item); signal_stop(); } diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index 0d584b0d..aff7db15 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -48,13 +48,13 @@ static void window_item_add_signal(WINDOW_REC *window, WI_ITEM_REC *item, int au if (!automatic || settings_get_bool("window_auto_change")) { if (automatic) - signal_emit__window_changed_automatic(window); + SIGNAL_EMIT(window_changed_automatic, window); window_set_active(window); } window->items = g_slist_append(window->items, item); if (send_signal) - signal_emit__window_item_new(window, item); + SIGNAL_EMIT(window_item_new, window, item); if (g_slist_length(window->items) == 1 || (!automatic && settings_get_bool("autofocus_new_items"))) { @@ -88,7 +88,7 @@ static void window_item_remove_signal(WI_ITEM_REC *item, int emit_signal) } if (emit_signal) - signal_emit__window_item_remove(window, item); + SIGNAL_EMIT(window_item_remove, window, item); } void window_item_remove(WI_ITEM_REC *item) @@ -111,7 +111,7 @@ void window_item_change_server(WI_ITEM_REC *item, void *server) window = window_item_window(item); item->server = server; - signal_emit__window_item_server_changed(window, item); + SIGNAL_EMIT(window_item_server_changed, window, item); if (window->active == item) window_change_server(window, item->server); } @@ -127,7 +127,7 @@ void window_item_set_active(WINDOW_REC *window, WI_ITEM_REC *item) /* move item to different window */ window_item_remove_signal(item, FALSE); window_item_add_signal(window, item, FALSE, FALSE); - signal_emit__window_item_moved(window, item, old_window); + SIGNAL_EMIT(window_item_moved, window, item, old_window); } } @@ -135,7 +135,7 @@ void window_item_set_active(WINDOW_REC *window, WI_ITEM_REC *item) window->active = item; if (item != NULL && window->active_server != item->server) window_change_server(window, item->server); - signal_emit__window_item_changed(window, item); + SIGNAL_EMIT(window_item_changed, window, item); } } @@ -314,7 +314,7 @@ void window_item_create(WI_ITEM_REC *item, int automatic) if (window == NULL) { /* create new window to use */ if (settings_get_bool("autocreate_split_windows")) { - signal_emit__gui_window_create_override(GINT_TO_POINTER(MAIN_WINDOW_TYPE_SPLIT)); + SIGNAL_EMIT(gui_window_create_override, GINT_TO_POINTER(MAIN_WINDOW_TYPE_SPLIT)); } window = window_create(item, automatic); } else { diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c index ace17e76..c9bcf869 100644 --- a/src/fe-common/core/windows-layout.c +++ b/src/fe-common/core/windows-layout.c @@ -102,14 +102,14 @@ static void window_add_items(WINDOW_REC *window, CONFIG_NODE *node) type = config_node_get_str(node, "type", NULL); if (type != NULL) { - signal_emit__layout_restore_item(window, type, node); + SIGNAL_EMIT(layout_restore_item, window, type, node); } } } void windows_layout_restore(void) { - signal_emit__layout_restore(); + SIGNAL_EMIT(layout_restore); } static void sig_layout_restore(void) @@ -143,7 +143,7 @@ static void sig_layout_restore(void) window->theme = theme_load(window->theme_name); window_add_items(window, iconfig_node_section(node, "items", -1)); - signal_emit__layout_restore_window(window, node); + SIGNAL_EMIT(layout_restore_window, window, node); } } @@ -186,7 +186,7 @@ static void window_save_items(WINDOW_REC *window, CONFIG_NODE *node) node = iconfig_node_section(node, "items", NODE_TYPE_LIST); for (tmp = window->items; tmp != NULL; tmp = tmp->next) - signal_emit__layout_save_item(window, tmp->data, node); + SIGNAL_EMIT(layout_save_item, window, tmp->data, node); } static void window_save(WINDOW_REC *window, CONFIG_NODE *node) @@ -223,7 +223,7 @@ static void window_save(WINDOW_REC *window, CONFIG_NODE *node) if (window->items != NULL) window_save_items(window, node); - signal_emit__layout_save_window(window, node); + SIGNAL_EMIT(layout_save_window, window, node); } void windows_layout_save(void) @@ -237,7 +237,7 @@ void windows_layout_save(void) sorted = windows_get_sorted(); g_slist_foreach(sorted, (GFunc) window_save, node); g_slist_free(sorted); - signal_emit__layout_save(); + SIGNAL_EMIT(layout_save); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWS_LAYOUT_SAVED); @@ -254,7 +254,7 @@ void windows_layout_reset(void) } iconfig_set_str(NULL, "windows", NULL); - signal_emit__layout_reset(); + SIGNAL_EMIT(layout_reset); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_WINDOWS_LAYOUT_RESET); diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c index 4cb52d6f..ea8d73fd 100644 --- a/src/fe-common/irc/dcc/fe-dcc-chat.c +++ b/src/fe-common/irc/dcc/fe-dcc-chat.c @@ -104,7 +104,7 @@ static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg) if (query == NULL) completion_last_message_add(sender); - signal_emit__message_dcc(dcc, msg); + SIGNAL_EMIT(message_dcc, dcc, msg); g_free_not_null(freemsg); g_free(sender); @@ -121,7 +121,7 @@ static void dcc_chat_action(CHAT_DCC_REC *dcc, const char *msg) if (query_find(NULL, sender) == NULL) completion_last_message_add(sender); - signal_emit__message_dcc_action(dcc, msg); + SIGNAL_EMIT(message_dcc_action, dcc, msg); g_free(sender); } @@ -129,7 +129,7 @@ static void dcc_chat_ctcp(CHAT_DCC_REC *dcc, const char *cmd, const char *data) { g_return_if_fail(IS_DCC_CHAT(dcc)); - signal_emit__message_dcc_ctcp(dcc, cmd, data); + SIGNAL_EMIT(message_dcc_ctcp, dcc, cmd, data); } static void dcc_error_ctcp(const char *type, const char *data, @@ -259,7 +259,7 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (query_find(NULL, target) == NULL) completion_last_message_add(target); - signal_emit__message_dcc_own(dcc, text); + SIGNAL_EMIT(message_dcc_own, dcc, text); } cmd_params_free(free_arg); @@ -271,7 +271,7 @@ static void cmd_me(const char *data, SERVER_REC *server, WI_ITEM_REC *item) dcc = item_get_dcc(item); if (dcc != NULL) - signal_emit__message_dcc_own__action(dcc, data); + SIGNAL_EMIT(message_dcc_own__action, dcc, data); } static void cmd_action(const char *data, SERVER_REC *server, WI_ITEM_REC *item) @@ -301,7 +301,7 @@ static void cmd_action(const char *data, SERVER_REC *server, WI_ITEM_REC *item) if (query_find(NULL, target) == NULL) completion_last_message_add(target); - signal_emit__message_dcc_own__action(dcc, text); + SIGNAL_EMIT(message_dcc_own__action, dcc, text); } cmd_params_free(free_arg); } @@ -334,7 +334,7 @@ static void cmd_ctcp(const char *data, SERVER_REC *server) IRCTXT_DCC_CHAT_NOT_FOUND, target+1); } else { ascii_strup(ctcpcmd); - signal_emit__message_dcc_own__ctcp(dcc, ctcpcmd, ctcpdata); + SIGNAL_EMIT(message_dcc_own__ctcp, dcc, ctcpcmd, ctcpdata); } cmd_params_free(free_arg); diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c index ad5726f6..dae8486c 100644 --- a/src/fe-common/irc/dcc/fe-dcc.c +++ b/src/fe-common/irc/dcc/fe-dcc.c @@ -143,7 +143,7 @@ static void cmd_dcc_list(const char *data) printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_HEADER); for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) - signal_emit__dcc_list_print(tmp->data); + SIGNAL_EMIT(dcc_list_print, tmp->data); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_FOOTER); } diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c index 219bc399..4f150957 100644 --- a/src/fe-common/irc/fe-ctcp.c +++ b/src/fe-common/irc/fe-ctcp.c @@ -60,7 +60,7 @@ static void ctcp_ping_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, const char *target) { - signal_emit__message_irc_ctcp(server, "PING", + SIGNAL_EMIT(message_irc_ctcp, server, "PING", data, nick, addr, target); } @@ -68,7 +68,7 @@ static void ctcp_version_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, const char *target) { - signal_emit__message_irc_ctcp(server, "VERSION", + SIGNAL_EMIT(message_irc_ctcp, server, "VERSION", data, nick, addr, target); } @@ -76,7 +76,7 @@ static void ctcp_time_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, const char *target) { - signal_emit__message_irc_ctcp(server, "TIME", + SIGNAL_EMIT(message_irc_ctcp, server, "TIME", data, nick, addr, target); } @@ -84,7 +84,7 @@ static void ctcp_userinfo_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, const char *target) { - signal_emit__message_irc_ctcp(server, "USERINFO", + SIGNAL_EMIT(message_irc_ctcp, server, "USERINFO", data, nick, addr, target); } @@ -92,7 +92,7 @@ static void ctcp_clientinfo_msg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr, const char *target) { - signal_emit__message_irc_ctcp(server, "CLIENTINFO", + SIGNAL_EMIT(message_irc_ctcp, server, "CLIENTINFO", data, nick, addr, target); } diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index 58d1674d..ded698b6 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -64,15 +64,15 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data, /* pass the original target to the signal, with the @+ here * the other one is only needed for recode_in*/ - signal_emit__message_irc_op__public(server, recoded, nick, addr, target); + SIGNAL_EMIT(message_irc_op__public, server, recoded, nick, addr, target); } else { recoded = recode_in(SERVER(server), msg, server_ischannel(SERVER(server), target) ? target : nick); if (server_ischannel(SERVER(server), target)) - signal_emit__message_public( + SIGNAL_EMIT(message_public, (SERVER_REC *)server, recoded, nick, addr, get_visible_target(server, target)); else - signal_emit__message_private( + SIGNAL_EMIT(message_private, (SERVER_REC *)server, recoded, nick, addr, get_visible_target(server, target)); } @@ -89,7 +89,7 @@ static void ctcp_action(IRC_SERVER_REC *server, const char *data, g_return_if_fail(data != NULL); recoded = recode_in(SERVER(server), data, target); - signal_emit__message_irc_action(server, recoded, nick, addr, + SIGNAL_EMIT(message_irc_action, server, recoded, nick, addr, get_visible_target(server, target)); g_free(recoded); } @@ -109,7 +109,7 @@ static void event_notice(IRC_SERVER_REC *server, const char *data, server->real_address; } - signal_emit__message_irc_notice(server, recoded, nick, addr, + SIGNAL_EMIT(message_irc_notice, server, recoded, nick, addr, get_visible_target(server, target)); g_free(params); g_free(recoded); @@ -126,7 +126,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data, tmp = strchr(channel, 7); /* ^G does something weird.. */ if (tmp != NULL) *tmp = '\0'; - signal_emit__message_join((SERVER_REC *)server, + SIGNAL_EMIT(message_join, (SERVER_REC *)server, get_visible_target(server, channel), nick, addr); g_free(params); } @@ -141,7 +141,7 @@ static void event_part(IRC_SERVER_REC *server, const char *data, params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &channel, &reason); recoded = recode_in(SERVER(server), reason, channel); - signal_emit__message_part((SERVER_REC *)server, + SIGNAL_EMIT(message_part, (SERVER_REC *)server, get_visible_target(server, channel), nick, addr, recoded); g_free(params); g_free(recoded); @@ -156,7 +156,7 @@ static void event_quit(IRC_SERVER_REC *server, const char *data, if (*data == ':') data++; /* quit message */ recoded = recode_in(SERVER(server), data, nick); - signal_emit__message_quit((SERVER_REC *)server, nick, addr, recoded); + SIGNAL_EMIT(message_quit, (SERVER_REC *)server, nick, addr, recoded); g_free(recoded); } @@ -170,7 +170,7 @@ static void event_kick(IRC_SERVER_REC *server, const char *data, params = event_get_params(data, 3 | PARAM_FLAG_GETREST, &channel, &nick, &reason); recoded = recode_in(SERVER(server), reason, channel); - signal_emit__message_kick((SERVER_REC *)server, get_visible_target(server, channel), + SIGNAL_EMIT(message_kick, (SERVER_REC *)server, get_visible_target(server, channel), nick, kicker, addr, recoded); g_free(params); g_free(recoded); @@ -219,10 +219,10 @@ static void event_nick(IRC_SERVER_REC *server, const char *data, /* NOTE: server->nick was already changed in irc/core/irc-nicklist.c */ if (g_ascii_strcasecmp(newnick, server->nick) == 0) - signal_emit__message_own__nick( + SIGNAL_EMIT(message_own__nick, (SERVER_REC *)server, newnick, sender, addr); else - signal_emit__message_nick( + SIGNAL_EMIT(message_nick, (SERVER_REC *)server, newnick, sender, addr); g_free(params); @@ -238,7 +238,7 @@ static void event_mode(IRC_SERVER_REC *server, const char *data, params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &channel, &mode); - signal_emit__message_irc_mode(server, get_visible_target(server, channel), + SIGNAL_EMIT(message_irc_mode, server, get_visible_target(server, channel), nick, addr, g_strchomp(mode)); g_free(params); } @@ -263,7 +263,7 @@ static void event_invite(IRC_SERVER_REC *server, const char *data, g_return_if_fail(data != NULL); params = event_get_params(data, 2, NULL, &channel); - signal_emit__message_invite((SERVER_REC *)server, get_visible_target(server, channel), nick, addr); + SIGNAL_EMIT(message_invite, (SERVER_REC *)server, get_visible_target(server, channel), nick, addr); g_free(params); } @@ -277,7 +277,7 @@ static void event_topic(IRC_SERVER_REC *server, const char *data, params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &channel, &topic); recoded = recode_in(SERVER(server), topic, channel); - signal_emit__message_topic((SERVER_REC *)server, + SIGNAL_EMIT(message_topic, (SERVER_REC *)server, get_visible_target(server, channel), recoded, nick, addr); g_free(params); g_free(recoded); @@ -419,7 +419,7 @@ static void sig_whowas_event_end(IRC_SERVER_REC *server, const char *data, g_return_if_fail(data != NULL); if (server->whowas_found) { - signal_emit__event_("369", (SERVER_REC *)server, data, sender, addr); + SIGNAL_EMIT_(event, "369", (SERVER_REC *)server, data, sender, addr); return; } @@ -437,7 +437,7 @@ static void event_received(IRC_SERVER_REC *server, const char *data, } /* numeric event. */ - signal_emit__default_event_numeric((SERVER_REC *)server, data, nick, addr); + SIGNAL_EMIT(default_event_numeric, (SERVER_REC *)server, data, nick, addr); } void fe_events_init(void) diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 092991e6..1e1bf0d3 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -60,7 +60,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) splitdata = irc_server_split_action(server, target, data); while ((subdata = splitdata[n++])) { irc_server_send_action(server, target, subdata); - signal_emit__message_irc_own__action(server, subdata, + SIGNAL_EMIT(message_irc_own__action, server, subdata, item->visible_name); } g_strfreev(splitdata); @@ -92,7 +92,7 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server) splittexts = irc_server_split_action(server, target, text); while ((subtext = splittexts[n++])) { irc_server_send_action(server, target, subtext); - signal_emit__message_irc_own__action(server, subtext, + SIGNAL_EMIT(message_irc_own__action, server, subtext, target); } @@ -117,7 +117,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server, if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); - signal_emit__message_irc_own__notice(server, msg, target); + SIGNAL_EMIT(message_irc_own__notice, server, msg, target); cmd_params_free(free_arg); } @@ -146,7 +146,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server, } ascii_strup(ctcpcmd); - signal_emit__message_irc_own__ctcp(server, ctcpcmd, ctcpdata, target); + SIGNAL_EMIT(message_irc_own__ctcp, server, ctcpcmd, ctcpdata, target); cmd_params_free(free_arg); } @@ -167,7 +167,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server, if (*target == '\0' || *text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); - signal_emit__message_irc_own__notice(server, text, target); + SIGNAL_EMIT(message_irc_own__notice, server, text, target); cmd_params_free(free_arg); } @@ -188,7 +188,7 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, chanrec = irc_channel_find(server, channame); if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND); - signal_emit__message_irc_own__wall(server, msg, + SIGNAL_EMIT(message_irc_own__wall, server, msg, chanrec->visible_name); cmd_params_free(free_arg); @@ -201,10 +201,10 @@ static void bans_ask_channel(const char *channel, IRC_SERVER_REC *server, str = g_string_new(NULL); g_string_printf(str, "%s b", channel); - signal_emit__command_("mode", str->str, (SERVER_REC *)server, item); + SIGNAL_EMIT_(command, "mode", str->str, (SERVER_REC *)server, item); if (server->emode_known) { g_string_printf(str, "%s e", channel); - signal_emit__command_("mode", str->str, (SERVER_REC *)server, item); + SIGNAL_EMIT_(command, "mode", str->str, (SERVER_REC *)server, item); } g_string_free(str, TRUE); } @@ -290,7 +290,7 @@ static void cmd_ver(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) str = g_strdup_printf("%s VERSION", *data == '\0' ? window_item_get_target(item) : data); - signal_emit__command_("ctcp", str, (SERVER_REC *)server, item); + SIGNAL_EMIT_(command, "ctcp", str, (SERVER_REC *)server, item); g_free(str); } diff --git a/src/fe-fuzz/server.c b/src/fe-fuzz/server.c index 175cba6a..f7777c33 100644 --- a/src/fe-fuzz/server.c +++ b/src/fe-fuzz/server.c @@ -93,7 +93,7 @@ void event_connected(IRC_SERVER_REC *server, const char *data, const char *from) server->wanted_usermode = g_strdup(server->connrec->usermode); } - signal_emit__event_connected(server); + SIGNAL_EMIT(event_connected, server); g_free(params); } @@ -165,7 +165,7 @@ int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { } else { prefixedLine = g_strdup_printf("%s\n", *lines); } - signal_emit__server_incoming(server, prefixedLine); + SIGNAL_EMIT(server_incoming, server, prefixedLine); g_free(prefixedLine); } diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c index 5e0f146f..0088b09a 100644 --- a/src/fe-text/gui-printtext.c +++ b/src/fe-text/gui-printtext.c @@ -139,7 +139,7 @@ void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *s gui->insert_after_time = time; format_send_to_gui(dest, str); gui->use_insert_after = FALSE; - signal_emit__gui_print_text_after_finished(dest->window, gui->insert_after, prev); + SIGNAL_EMIT(gui_print_text_after_finished, dest->window, gui->insert_after, prev); } void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str) diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 276ff056..8942b206 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -270,7 +270,7 @@ static void paste_send_line(char *text) /* we need to get the current history every time because it might change between calls */ command_history_add(command_history_current(active_win), text); - signal_emit__send_command(text, active_win->active_server, active_win->active); + SIGNAL_EMIT(send_command, text, active_win->active_server, active_win->active); } static void paste_send(void) @@ -493,7 +493,7 @@ static void key_send_line(void) } if (redir == NULL) { - signal_emit__send_command(str, + SIGNAL_EMIT(send_command, str, active_win->active_server, active_win->active); } else { @@ -740,7 +740,7 @@ static gboolean paste_timeout(gpointer data) for (i = 0; i < paste_buffer->len; i++) { unichar key = g_array_index(paste_buffer, unichar, i); - signal_emit__gui_key_pressed(GINT_TO_POINTER(key)); + SIGNAL_EMIT(gui_key_pressed, GINT_TO_POINTER(key)); } g_array_set_size(paste_buffer, 0); } else if (paste_verify_line_count > 0 && @@ -852,7 +852,7 @@ static void sig_input(void) for (i = 0; i < paste_buffer->len; i++) { unichar key = g_array_index(paste_buffer, unichar, i); - signal_emit__gui_key_pressed(GINT_TO_POINTER(key)); + SIGNAL_EMIT(gui_key_pressed, GINT_TO_POINTER(key)); if (paste_bracketed_mode) { /* just enabled by the signal, remove what was processed so far */ @@ -891,17 +891,17 @@ static void key_scroll_forward(void) static void key_scroll_start(void) { - signal_emit__command_("scrollback home", NULL, active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "scrollback home", NULL, active_win->active_server, active_win->active); } static void key_scroll_end(void) { - signal_emit__command_("scrollback end", NULL, active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "scrollback end", NULL, active_win->active_server, active_win->active); } static void key_change_window(const char *data) { - signal_emit__command_("window goto", data, active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window goto", data, active_win->active_server, active_win->active); } static void key_completion(int erase, int backward) @@ -951,37 +951,37 @@ static void key_check_replaces(void) static void key_previous_window(void) { - signal_emit__command_("window previous", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window previous", "", active_win->active_server, active_win->active); } static void key_next_window(void) { - signal_emit__command_("window next", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window next", "", active_win->active_server, active_win->active); } static void key_left_window(void) { - signal_emit__command_("window _left", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window _left", "", active_win->active_server, active_win->active); } static void key_right_window(void) { - signal_emit__command_("window right", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window right", "", active_win->active_server, active_win->active); } static void key_upper_window(void) { - signal_emit__command_("window up", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window up", "", active_win->active_server, active_win->active); } static void key_lower_window(void) { - signal_emit__command_("window down", "", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window down", "", active_win->active_server, active_win->active); } static void key_active_window(void) { - signal_emit__command_("window goto", "active", active_win->active_server, active_win->active); + SIGNAL_EMIT_(command, "window goto", "active", active_win->active_server, active_win->active); } static SERVER_REC *get_prev_server(SERVER_REC *current) @@ -1050,7 +1050,7 @@ static void key_previous_window_item(void) SERVER_REC *server; if (active_win->items != NULL) { - signal_emit__command_("window item prev", "", + SIGNAL_EMIT_(command, "window item prev", "", active_win->active_server, active_win->active); } else if (servers != NULL || lookup_servers != NULL) { /* change server */ @@ -1058,7 +1058,7 @@ static void key_previous_window_item(void) if (server == NULL) server = active_win->connect_server; server = get_prev_server(server); - signal_emit__command_("window server", server->tag, + SIGNAL_EMIT_(command, "window server", server->tag, active_win->active_server, active_win->active); } } @@ -1068,7 +1068,7 @@ static void key_next_window_item(void) SERVER_REC *server; if (active_win->items != NULL) { - signal_emit__command_("window item next", "", + SIGNAL_EMIT_(command, "window item next", "", active_win->active_server, active_win->active); } else if (servers != NULL || lookup_servers != NULL) { /* change server */ @@ -1076,7 +1076,7 @@ static void key_next_window_item(void) if (server == NULL) server = active_win->connect_server; server = get_next_server(server); - signal_emit__command_("window server", server->tag, + SIGNAL_EMIT_(command, "window server", server->tag, active_win->active_server, active_win->active); } } diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c index 7a0d4a6e..4501b009 100644 --- a/src/fe-text/gui-windows.c +++ b/src/fe-text/gui-windows.c @@ -101,7 +101,7 @@ static void gui_window_created(WINDOW_REC *window, void *automatic) (new_parent && settings_get_bool("autostick_split_windows")))) gui_window_set_sticky(window); - signal_emit__gui_window_created(window); + SIGNAL_EMIT(gui_window_created, window); } static void gui_window_destroyed(WINDOW_REC *window) @@ -116,7 +116,7 @@ static void gui_window_destroyed(WINDOW_REC *window) gui_window_set_unsticky(window); - signal_emit__gui_window_destroyed(window); + SIGNAL_EMIT(gui_window_destroyed, window); gui_window_deinit(gui); window->gui_data = NULL; @@ -147,7 +147,7 @@ void gui_window_scroll(WINDOW_REC *window, int lines) g_return_if_fail(window != NULL); textbuffer_view_scroll(WINDOW_GUI(window)->view, lines); - signal_emit__gui_page_scrolled(window); + SIGNAL_EMIT(gui_page_scrolled, window); } void gui_window_scroll_line(WINDOW_REC *window, LINE_REC *line) @@ -156,7 +156,7 @@ void gui_window_scroll_line(WINDOW_REC *window, LINE_REC *line) g_return_if_fail(line != NULL); textbuffer_view_scroll_line(WINDOW_GUI(window)->view, line); - signal_emit__gui_page_scrolled(window); + SIGNAL_EMIT(gui_page_scrolled, window); } void gui_window_set_sticky(WINDOW_REC *window) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index cc44d695..63e91977 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -197,7 +197,7 @@ static void textui_finish_init(void) dirty_check(); fe_common_core_finish_init(); - signal_emit__irssi_init_finished(); + SIGNAL_EMIT(irssi_init_finished); statusbar_redraw(NULL, TRUE); if (servers == NULL && lookup_servers == NULL) { @@ -339,7 +339,7 @@ int main(int argc, char **argv) if (reload_config) { /* SIGHUP received, do /RELOAD */ reload_config = FALSE; - signal_emit__command_("reload", "", NULL, NULL); + SIGNAL_EMIT_(command, "reload", "", NULL, NULL); } dirty_check(); diff --git a/src/fe-text/lastlog.c b/src/fe-text/lastlog.c index 34a22502..f90ad505 100644 --- a/src/fe-text/lastlog.c +++ b/src/fe-text/lastlog.c @@ -50,7 +50,7 @@ int cmd_options_get_level(const char *cmd, GHashTable *optlist) level = level_get(list->data); if (level == 0) { /* unknown option */ - signal_emit__error_command(GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_OPTION_UNKNOWN), list->data); retlevel = -1; break; diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c index bd30a911..762b67f9 100644 --- a/src/fe-text/mainwindows-layout.c +++ b/src/fe-text/mainwindows-layout.c @@ -259,7 +259,7 @@ static void sig_layout_restore(void) if (node2->key == NULL) continue; /* create a new window + mainwindow */ - signal_emit__gui_window_create_override(GINT_TO_POINTER(window == NULL ? MAIN_WINDOW_TYPE_SPLIT : MAIN_WINDOW_TYPE_RSPLIT)); + SIGNAL_EMIT(gui_window_create_override, GINT_TO_POINTER(window == NULL ? MAIN_WINDOW_TYPE_SPLIT : MAIN_WINDOW_TYPE_RSPLIT)); new_win = window_create(NULL, TRUE); diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c index c32ee6aa..c42d0de2 100644 --- a/src/fe-text/mainwindows.c +++ b/src/fe-text/mainwindows.c @@ -120,7 +120,7 @@ static void mainwindow_resize_windows(MAIN_WINDOW_REC *window) } if (resized) - signal_emit__mainwindow_resized(window); + SIGNAL_EMIT(mainwindow_resized, window); } static void mainwindow_resize(MAIN_WINDOW_REC *window, int xdiff, int ydiff) @@ -276,7 +276,7 @@ MAIN_WINDOW_REC *mainwindow_create(int right) term_refresh(NULL); mainwindows = g_slist_append(mainwindows, rec); - signal_emit__mainwindow_created(rec); + SIGNAL_EMIT(mainwindow_created, rec); return rec; } @@ -531,7 +531,7 @@ static void mainwindow_destroy_full(MAIN_WINDOW_REC *window, int respace) g_return_if_fail(window != NULL); mainwindows = g_slist_remove(mainwindows, window); - signal_emit__mainwindow_destroyed(window); + SIGNAL_EMIT(mainwindow_destroyed, window); term_window_destroy(window->screen_win); @@ -697,7 +697,7 @@ static void mainwindows_resize_smaller(int ydiff) win->size_dirty = TRUE; win->first_line += ydiff; win->last_line += ydiff; - signal_emit__mainwindow_moved(win); + SIGNAL_EMIT(mainwindow_moved, win); } } else { if (space > -ydiff) space = -ydiff; @@ -835,7 +835,7 @@ void mainwindows_resize(int width, int height) window_set_active(active_mainwin->active); } - signal_emit__terminal_resized(); + SIGNAL_EMIT(terminal_resized); irssi_redraw(); } diff --git a/src/fe-text/statusbar.c b/src/fe-text/statusbar.c index 2c4ff4f5..81a649f5 100644 --- a/src/fe-text/statusbar.c +++ b/src/fe-text/statusbar.c @@ -548,7 +548,7 @@ STATUSBAR_REC *statusbar_create(STATUSBAR_GROUP_REC *group, g_free(value); statusbars_recalc_ypos(bar); - signal_emit__statusbar_created(bar); + SIGNAL_EMIT(statusbar_created, bar); /* create the items to statusbar */ for (tmp = config->items; tmp != NULL; tmp = tmp->next) { @@ -571,7 +571,7 @@ void statusbar_destroy(STATUSBAR_REC *bar) g_slist_remove(bar->parent_window->statusbars, bar); } - signal_emit__statusbar_destroyed(bar); + SIGNAL_EMIT(statusbar_destroyed, bar); while (bar->items != NULL) statusbar_item_destroy(bar->items->data); @@ -915,7 +915,7 @@ SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar, rec->dirty = TRUE; bar->dirty = TRUE; - signal_emit__statusbar_item_created(rec); + SIGNAL_EMIT(statusbar_item_created, rec); return rec; } @@ -960,7 +960,7 @@ void statusbar_item_destroy(SBAR_ITEM_REC *item) else g_hash_table_insert(named_sbar_items, item->config->name, list); - signal_emit__statusbar_item_destroyed(item); + SIGNAL_EMIT(statusbar_item_destroyed, item); list = g_hash_table_lookup(sbar_item_signals, item); g_hash_table_remove(sbar_item_signals, item); diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c index 5a45ca9b..6c2c521d 100644 --- a/src/fe-text/term-terminfo.c +++ b/src/fe-text/term-terminfo.c @@ -740,7 +740,7 @@ void term_gets(GArray *buffer, int *line_count) } else if (ret == -1 && (errno == EINTR || errno == EAGAIN)) ret = 0; if (ret == -1) - signal_emit__command_("quit", "Lost terminal", NULL, NULL); + SIGNAL_EMIT_(command, "quit", "Lost terminal", NULL, NULL); if (ret > 0) { /* convert input to unichars. */ diff --git a/src/fe-text/textbuffer-view.c b/src/fe-text/textbuffer-view.c index 11ec689d..fabc3b73 100644 --- a/src/fe-text/textbuffer-view.c +++ b/src/fe-text/textbuffer-view.c @@ -1273,7 +1273,7 @@ void textbuffer_view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line) g_return_if_fail(view != NULL); g_return_if_fail(line != NULL); - signal_emit__gui_textbuffer_line_removed(view, line, line->prev); + SIGNAL_EMIT(gui_textbuffer_line_removed, view, line, line->prev); linecount = view_get_linecount(view, line); update_counter = view->cache->update_counter+1; diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index bdc3bbdd..2568e73c 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -326,7 +326,7 @@ static void read_settings(void) g_free_not_null(default_ban_type_str); default_ban_type = parse_ban_type(settings_get_str("ban_type")); if (default_ban_type <= 0 || default_ban_type_str != NULL) { - signal_emit__ban_type_changed(GINT_TO_POINTER(default_ban_type)); + SIGNAL_EMIT(ban_type_changed, GINT_TO_POINTER(default_ban_type)); } if (default_ban_type <= 0) diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c index 3dff1174..d88405e7 100644 --- a/src/irc/core/channel-events.c +++ b/src/irc/core/channel-events.c @@ -160,7 +160,7 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel, chanrec->topic_time = settime; } - signal_emit__channel_topic_changed(chanrec); + SIGNAL_EMIT(channel_topic_changed, chanrec); } static void event_topic_get(SERVER_REC *server, const char *data, const char *u0, const char *u1) diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c index 6fef3862..8dbf5717 100644 --- a/src/irc/core/channel-rejoin.c +++ b/src/irc/core/channel-rejoin.c @@ -43,7 +43,7 @@ static void rejoin_destroy(IRC_SERVER_REC *server, REJOIN_REC *rec) server->rejoin_channels = g_slist_remove(server->rejoin_channels, rec); - signal_emit__channel_rejoin_remove((SERVER_REC *)server, rec); + SIGNAL_EMIT(channel_rejoin_remove, (SERVER_REC *)server, rec); g_free(rec->channel); g_free_not_null(rec->key); @@ -105,7 +105,7 @@ static int channel_rejoin(IRC_SERVER_REC *server, const char *channel) server->rejoin_channels = g_slist_append(server->rejoin_channels, rec); - signal_emit__channel_rejoin_new((SERVER_REC *)server, rec); + SIGNAL_EMIT(channel_rejoin_new, (SERVER_REC *)server, rec); } chanrec->left = TRUE; diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c index 42976e98..3a14397c 100644 --- a/src/irc/core/channels-query.c +++ b/src/irc/core/channels-query.c @@ -315,7 +315,7 @@ static void channel_checksync(IRC_CHANNEL_REC *channel) } channel->synced = TRUE; - signal_emit__channel_sync((CHANNEL_REC *)channel); + SIGNAL_EMIT(channel_sync, (CHANNEL_REC *)channel); } /* Error occurred when trying to execute query - abort and try again. */ @@ -469,7 +469,7 @@ static void event_end_of_who(SERVER_REC *server, const char *data, const char *u failed = TRUE; } else { chanrec->wholist = TRUE; - signal_emit__channel_wholist((CHANNEL_REC *)chanrec); + SIGNAL_EMIT(channel_wholist, (CHANNEL_REC *)chanrec); channel_got_query(chanrec, CHANNEL_QUERY_WHO); } } diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c index 620d64d9..f68bd277 100644 --- a/src/irc/core/ctcp.c +++ b/src/irc/core/ctcp.c @@ -227,7 +227,7 @@ static void ctcp_msg(IRC_SERVER_REC *server, const char *data, if (g_ascii_strncasecmp(data, "ACTION ", 7) == 0) { /* special treatment for actions */ - signal_emit__ctcp_action(server, data+7, + SIGNAL_EMIT(ctcp_action, server, data+7, nick, addr, target); return; } @@ -240,8 +240,8 @@ static void ctcp_msg(IRC_SERVER_REC *server, const char *data, if (args != NULL) *args++ = '\0'; else args = ""; ascii_strdown(str+9); - if (!signal_emit__ctcp_msg_(data, server, args, nick, addr, target)) { - signal_emit__default_ctcp_msg(server, data, nick, addr, target); + if (!SIGNAL_EMIT_(ctcp_msg, data, server, args, nick, addr, target)) { + SIGNAL_EMIT(default_ctcp_msg, server, data, nick, addr, target); } g_free(str); } @@ -259,8 +259,8 @@ static void ctcp_reply(IRC_SERVER_REC *server, const char *data, if (args != NULL) *args++ = '\0'; else args = ""; ascii_strdown(str+11); - if (!signal_emit__ctcp_reply_(data, server, args, nick, addr, target)) { - signal_emit__default_ctcp_reply(server, data, nick, addr, target); + if (!SIGNAL_EMIT_(ctcp_reply, data, server, args, nick, addr, target)) { + SIGNAL_EMIT(default_ctcp_reply, server, data, nick, addr, target); } g_free(str); } @@ -286,7 +286,7 @@ static void event_privmsg(SERVER_REC *server, const char *data, if (msg[len-1] == '\001') msg[len-1] = '\0'; - signal_emit__ctcp_msg((IRC_SERVER_REC *) server, msg, nick, addr, target); + SIGNAL_EMIT(ctcp_msg, (IRC_SERVER_REC *) server, msg, nick, addr, target); signal_stop(); } @@ -310,7 +310,7 @@ static void event_notice(SERVER_REC *server, const char *data, ptr = strrchr(++msg, 1); if (ptr != NULL) *ptr = '\0'; - signal_emit__ctcp_reply((IRC_SERVER_REC *) server, msg, nick, addr, target); + SIGNAL_EMIT(ctcp_reply, (IRC_SERVER_REC *) server, msg, nick, addr, target); signal_stop(); } diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index 8889cc13..072ee0ed 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -49,14 +49,14 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable) if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL)) return FALSE; - signal_emit__server_cap_req(server, cap); + SIGNAL_EMIT(server_cap_req, server, cap); irc_send_cmdv(server, "CAP REQ %s", cap); return TRUE; } else if (!enable && gslist_find_string(server->cap_active, cap)) { char *negcap = g_strdup_printf("-%s", cap); - signal_emit__server_cap_req(server, negcap); + SIGNAL_EMIT(server_cap_req, server, negcap); irc_send_cmdv(server, "CAP REQ %s", negcap); g_free(negcap); @@ -74,7 +74,7 @@ void cap_finish_negotiation (IRC_SERVER_REC *server) server->cap_complete = TRUE; irc_send_cmd_now(server, "CAP END"); - signal_emit__server_cap_end(server); + SIGNAL_EMIT(server_cap_end, server); } static gboolean parse_cap_name(char *name, char **key, char **val) @@ -193,7 +193,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add /* If the server doesn't support any cap we requested close the negotiation here */ if (avail_caps > 0) { - signal_emit__server_cap_req(server, cmd->str + sizeof("CAP REQ :") - 1); + SIGNAL_EMIT(server_cap_req, server, cmd->str + sizeof("CAP REQ :") - 1); irc_send_cmd_now(server, cmd->str); } else { cap_finish_negotiation(server); @@ -218,7 +218,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add if (!strcmp(caps[i], "sasl")) got_sasl = TRUE; - signal_emit__server_cap_ack_(caps[i], server); + SIGNAL_EMIT_(server_cap_ack, caps[i], server); } /* Hopefully the server has ack'd all the caps requested and we're ready to terminate the @@ -233,7 +233,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add /* A NAK'd request means that a required cap can't be enabled or disabled, don't update the * list of active caps and notify the listeners. */ for (i = 0; i < caps_length; i++) - signal_emit__server_cap_nak_(caps[i], server); + SIGNAL_EMIT_(server_cap_nak, caps[i], server); } else if (!g_ascii_strcasecmp(evt, "NEW")) { for (i = 0; i < caps_length; i++) { @@ -245,7 +245,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add } g_hash_table_insert(server->cap_supported, key, val); - signal_emit__server_cap_new_(key, server); + SIGNAL_EMIT_(server_cap_new, key, server); } } else if (!g_ascii_strcasecmp(evt, "DEL")) { @@ -258,7 +258,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add } g_hash_table_remove(server->cap_supported, key); - signal_emit__server_cap_delete_(key, server); + SIGNAL_EMIT_(server_cap_delete, key, server); /* The server removed this CAP, remove it from the list * of the active ones if we had requested it */ server->cap_active = gslist_delete_string(server->cap_active, key, g_free); diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index 00e20d36..f3caf61c 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -240,7 +240,7 @@ static void sig_channel_destroyed(CHANNEL_REC *channel) if (!irc_channel->server->disconnected && !irc_channel->left && !irc_channel->kicked) { /* destroying channel record without actually having left the channel yet */ - signal_emit__command_("part", "", (SERVER_REC *)channel->server, (WI_ITEM_REC *)channel); + SIGNAL_EMIT_(command, "part", "", (SERVER_REC *)channel->server, (WI_ITEM_REC *)channel); } } diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index 6761b169..e2bbae23 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -466,7 +466,7 @@ static void event_whois(SERVER_REC *server, const char *data, return; irc_server->whois_found = TRUE; - signal_emit__event_("311", server, data, nick, addr); + SIGNAL_EMIT_(event, "311", server, data, nick, addr); } static void sig_whois_try_whowas(SERVER_REC *server, const char *data, const char *u0, const char *u1) @@ -498,7 +498,7 @@ static void event_end_of_whois(SERVER_REC *server, const char *data, if ((irc_server = IRC_SERVER(server)) == NULL) return; - signal_emit__event_("318", server, data, nick, addr); + SIGNAL_EMIT_(event, "318", server, data, nick, addr); irc_server->whois_found = FALSE; } @@ -510,7 +510,7 @@ static void event_whowas(SERVER_REC *server, const char *data, return; irc_server->whowas_found = TRUE; - signal_emit__event_("314", server, data, nick, addr); + SIGNAL_EMIT_(event, "314", server, data, nick, addr); } /* SYNTAX: WHOWAS [ [ [server]]] */ @@ -560,7 +560,7 @@ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item g_get_current_time(&tv); str = g_strdup_printf("%s PING %ld %ld", data, tv.tv_sec, tv.tv_usec); - signal_emit__command_("ctcp", str, (SERVER_REC *)server, (WI_ITEM_REC *)item); + SIGNAL_EMIT_(command, "ctcp", str, (SERVER_REC *)server, (WI_ITEM_REC *)item); g_free(str); } @@ -730,11 +730,11 @@ static void cmd_kickban(const char *data, IRC_SERVER_REC *server, g_free(spacenicks); if (settings_get_bool("kick_first_on_kickban")) { - signal_emit__command_("kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); - signal_emit__command_("ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); + SIGNAL_EMIT_(command, "kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); + SIGNAL_EMIT_(command, "ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); } else { - signal_emit__command_("ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); - signal_emit__command_("kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); + SIGNAL_EMIT_(command, "ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); + SIGNAL_EMIT_(command, "kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)chanrec); } g_free(kickcmd); g_free(bancmd); @@ -767,7 +767,7 @@ static void knockout_timeout_server(IRC_SERVER_REC *server) next = tmp->next; if (rec->unban_time <= now) { /* timeout, unban. */ - signal_emit__command_("unban", rec->ban, (SERVER_REC *)server, (WI_ITEM_REC *)rec->channel); + SIGNAL_EMIT_(command, "unban", rec->ban, (SERVER_REC *)server, (WI_ITEM_REC *)rec->channel); knockout_destroy(server, rec); } } @@ -827,13 +827,13 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server, g_strdup_printf("%s %s", channel->name, banmasks); if (settings_get_bool("kick_first_on_kickban")) { - signal_emit__command_("kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); + SIGNAL_EMIT_(command, "kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); if (bancmd != NULL) - signal_emit__command_("ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); + SIGNAL_EMIT_(command, "ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); } else { if (bancmd != NULL) - signal_emit__command_("ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); - signal_emit__command_("kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); + SIGNAL_EMIT_(command, "ban", bancmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); + SIGNAL_EMIT_(command, "kick", kickcmd, (SERVER_REC *)server, (WI_ITEM_REC *)channel); } g_free(kickcmd); g_free_not_null(bancmd); diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c index 09a162c6..16d843fe 100644 --- a/src/irc/core/irc-core.c +++ b/src/irc/core/irc-core.c @@ -129,7 +129,7 @@ void irc_core_init(void) void irc_core_deinit(void) { - signal_emit__chat_protocol_deinit(chat_protocol_find("IRC")); + SIGNAL_EMIT(chat_protocol_deinit, chat_protocol_find("IRC")); sasl_deinit(); cap_deinit(); diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c index c476c38c..5354f5d0 100644 --- a/src/irc/core/irc-nicklist.c +++ b/src/irc/core/irc-nicklist.c @@ -200,7 +200,7 @@ static void event_end_of_names(SERVER_REC *server, const char *data, const char nicklist_set_own(CHANNEL(chanrec), ownnick); chanrec->chanop = chanrec->ownnick->op; chanrec->names_got = TRUE; - signal_emit__channel_joined((CHANNEL_REC *)chanrec); + SIGNAL_EMIT(channel_joined, (CHANNEL_REC *)chanrec); } g_free(params); diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index 132b6344..e87e77f6 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -161,7 +161,7 @@ static void init_userinfo(void) } } - signal_emit__irssi_init_userinfo_changed(GUINT_TO_POINTER(changed)); + SIGNAL_EMIT(irssi_init_userinfo_changed, GUINT_TO_POINTER(changed)); } static void sig_server_setup_read(IRC_SERVER_SETUP_REC *rec, CONFIG_NODE *node) diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 9b1e17ac..df3a595c 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -731,7 +731,7 @@ static void event_connected(SERVER_REC *server, const char *data, const char *fr irc_server->wanted_usermode = g_strdup(irc_server->connrec->usermode); } - signal_emit__event_connected((SERVER_REC *)server); + SIGNAL_EMIT(event_connected, (SERVER_REC *)server); g_free(params); } diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c index 294b2191..3b5c95be 100644 --- a/src/irc/core/irc-session.c +++ b/src/irc/core/irc-session.c @@ -167,11 +167,11 @@ static void session_restore_channel(IRC_CHANNEL_REC *channel) { char *data; - signal_emit__event_("join", (SERVER_REC *)channel->server, channel->name, + SIGNAL_EMIT_(event, "join", (SERVER_REC *)channel->server, channel->name, channel->server->nick, channel->server->userhost); data = g_strconcat(channel->server->nick, " ", channel->name, NULL); - signal_emit__event_("366", (SERVER_REC *)channel->server, data, NULL, NULL); + SIGNAL_EMIT_(event, "366", (SERVER_REC *)channel->server, data, NULL, NULL); g_free(data); } @@ -189,7 +189,7 @@ static void sig_connected(IRC_SERVER_REC *server) free()'s the server->real_address and then tries to strdup() the given origin again */ addr = g_strdup(server->real_address); - signal_emit__event_("001", (SERVER_REC *)server, str, addr, NULL); + SIGNAL_EMIT_(event, "001", (SERVER_REC *)server, str, addr, NULL); g_free(addr); g_free(str); diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c index 7efb0fdc..e46bc735 100644 --- a/src/irc/core/irc.c +++ b/src/irc/core/irc.c @@ -341,10 +341,10 @@ static void irc_server_event(SERVER_REC *server, const char *line, /* emit it */ current_server_event = event+6; emitted = signal == NULL ? - signal_emit__event_(line, server, args, nick, address) : + SIGNAL_EMIT_(event, line, server, args, nick, address) : signal_emit_raw(signal, 4, irc_server, args, nick, address); if (!emitted) - signal_emit__default_event(server, line, nick, address); + SIGNAL_EMIT(default_event, server, line, nick, address); current_server_event = NULL; g_free(event); @@ -401,7 +401,7 @@ static void irc_parse_incoming_line(SERVER_REC *server, char *line) line = irc_parse_prefix(line, &nick, &address); if (*line != '\0') - signal_emit__server_event(server, line, nick, address); + SIGNAL_EMIT(server_event, server, line, nick, address); } /* input function: handle incoming server messages */ @@ -422,7 +422,7 @@ static void irc_parse_incoming(SERVER_REC *server) while (!server->disconnected && (ret = net_sendbuffer_receive_line(server->handle, &str, count < MAX_SOCKET_READS)) > 0) { rawlog_input(server->rawlog, str); - signal_emit__server_incoming(server, str); + SIGNAL_EMIT(server_incoming, server, str); if (server->connection_lost) server_disconnect(server); diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c index 120bd675..5637e845 100644 --- a/src/irc/core/lag.c +++ b/src/irc/core/lag.c @@ -62,7 +62,7 @@ static void lag_event_pong(IRC_SERVER_REC *server, const char *data, server->lag = (int) get_timeval_diff(&now, &server->lag_sent); memset(&server->lag_sent, 0, sizeof(server->lag_sent)); - signal_emit__server_lag((SERVER_REC *)server); + SIGNAL_EMIT(server_lag, (SERVER_REC *)server); } static void sig_unknown_command(IRC_SERVER_REC *server, const char *data) @@ -107,7 +107,7 @@ static int sig_check_lag(void) /* waiting for lag reply */ if (max_lag > 1 && now-rec->lag_sent.tv_sec > max_lag) { /* too much lag, disconnect */ - signal_emit__server_lag_disconnect((SERVER_REC *)rec); + SIGNAL_EMIT(server_lag_disconnect, (SERVER_REC *)rec); rec->connection_lost = TRUE; server_disconnect((SERVER_REC *) rec); } diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c index d51e7222..f3464a9b 100644 --- a/src/irc/core/massjoin.c +++ b/src/irc/core/massjoin.c @@ -212,7 +212,7 @@ static void massjoin_send(IRC_CHANNEL_REC *channel) g_hash_table_foreach(channel->nicks, (GHFunc) massjoin_send_hash, &list); channel->massjoins = 0; - signal_emit__massjoin((CHANNEL_REC *)channel, list); + SIGNAL_EMIT(massjoin, (CHANNEL_REC *)channel, list); g_slist_free(list); } diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c index e91105c1..ae2169a1 100644 --- a/src/irc/core/mode-lists.c +++ b/src/irc/core/mode-lists.c @@ -85,7 +85,7 @@ BAN_REC *banlist_add(IRC_CHANNEL_REC *channel, const char *ban, channel->banlist = g_slist_append(channel->banlist, rec); - signal_emit__ban_new((CHANNEL_REC *)channel, rec); + SIGNAL_EMIT(ban_new, (CHANNEL_REC *)channel, rec); return rec; } @@ -98,7 +98,7 @@ void banlist_remove(IRC_CHANNEL_REC *channel, const char *ban, const char *nick) rec = banlist_find(channel->banlist, ban); if (rec != NULL) { - signal_emit__ban_remove((CHANNEL_REC *)channel, rec, nick); + SIGNAL_EMIT(ban_remove, (CHANNEL_REC *)channel, rec, nick); ban_free(&channel->banlist, rec); } } diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index 96f3c4db..2f6387ca 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -57,7 +57,7 @@ static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick, modestr[0] = mode; modestr[1] = '\0'; typestr[0] = type; typestr[1] = '\0'; - signal_emit__nick_mode_changed((CHANNEL_REC *)channel, nickrec, setby, modestr, typestr); + SIGNAL_EMIT(nick_mode_changed, (CHANNEL_REC *)channel, nickrec, setby, modestr, typestr); } void prefix_add(char prefixes[MAX_USER_PREFIXES+1], char newprefix, SERVER_REC *server) @@ -403,7 +403,7 @@ void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby, g_free(channel->mode); channel->mode = g_strdup(newmode->str); - signal_emit__channel_mode_changed((CHANNEL_REC *)channel, setby); + SIGNAL_EMIT(channel_mode_changed, (CHANNEL_REC *)channel, setby); } g_string_free(newmode, TRUE); @@ -462,7 +462,7 @@ static void parse_user_mode(IRC_SERVER_REC *server, const char *modestr) server->usermode = newmode; server->server_operator = ((strchr(newmode, 'o') != NULL) || (strchr(newmode, 'O') != NULL)); - signal_emit__user_mode_changed((SERVER_REC *)server, oldmode); + SIGNAL_EMIT(user_mode_changed, (SERVER_REC *)server, oldmode); g_free_not_null(oldmode); } @@ -516,7 +516,7 @@ static void event_away(IRC_SERVER_REC *server, const char *data) g_return_if_fail(server != NULL); server->usermode_away = TRUE; - signal_emit__away_mode_changed((SERVER_REC *)server); + SIGNAL_EMIT(away_mode_changed, (SERVER_REC *)server); } static void event_unaway(IRC_SERVER_REC *server, const char *data) @@ -525,7 +525,7 @@ static void event_unaway(IRC_SERVER_REC *server, const char *data) server->usermode_away = FALSE; g_free_and_null(server->away_reason); - signal_emit__away_mode_changed((SERVER_REC *)server); + SIGNAL_EMIT(away_mode_changed, (SERVER_REC *)server); } static void sig_req_usermode_change(IRC_SERVER_REC *server, const char *data, @@ -546,7 +546,7 @@ static void sig_req_usermode_change(IRC_SERVER_REC *server, const char *data, g_free(params); - signal_emit__event_("mode", (SERVER_REC *)server, data, nick, addr); + SIGNAL_EMIT_(event, "mode", (SERVER_REC *)server, data, nick, addr); } void channel_set_singlemode(IRC_CHANNEL_REC *channel, const char *nicks, @@ -747,7 +747,7 @@ static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item, g_strfreev(matches); cmd_params_free(free_arg); - signal_emit__error_command(GINT_TO_POINTER(CMDERR_NOT_GOOD_IDEA), NULL); + SIGNAL_EMIT(error_command, GINT_TO_POINTER(CMDERR_NOT_GOOD_IDEA), NULL); signal_stop(); return NULL; } diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c index 3e05124a..3cf901da 100644 --- a/src/irc/core/netsplit.c +++ b/src/irc/core/netsplit.c @@ -72,7 +72,7 @@ static NETSPLIT_SERVER_REC *netsplit_server_create(IRC_SERVER_REC *server, rec->destserver = g_strdup(destserver); server->split_servers = g_slist_append(server->split_servers, rec); - signal_emit__netsplit_server_new(server, rec); + SIGNAL_EMIT(netsplit_server_new, server, rec); return rec; } @@ -84,7 +84,7 @@ static void netsplit_server_destroy(IRC_SERVER_REC *server, server->split_servers = g_slist_remove(server->split_servers, rec); - signal_emit__netsplit_server_remove(server, rec); + SIGNAL_EMIT(netsplit_server_remove, server, rec); g_free(rec->server); g_free(rec->destserver); @@ -146,7 +146,7 @@ static NETSPLIT_REC *netsplit_add(IRC_SERVER_REC *server, const char *nick, g_hash_table_insert(server->splits, rec->nick, rec); - signal_emit__netsplit_new(rec); + SIGNAL_EMIT(netsplit_new, rec); return rec; } @@ -157,7 +157,7 @@ static void netsplit_destroy(IRC_SERVER_REC *server, NETSPLIT_REC *rec) g_return_if_fail(IS_IRC_SERVER(server)); g_return_if_fail(rec != NULL); - signal_emit__netsplit_remove(rec); + SIGNAL_EMIT(netsplit_remove, rec); for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) { NETSPLIT_CHAN_REC *rec = tmp->data; diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c index b13a8f8c..0bc9d826 100644 --- a/src/irc/core/sasl.c +++ b/src/irc/core/sasl.c @@ -52,7 +52,7 @@ static gboolean sasl_timeout(IRC_SERVER_REC *server) server->sasl_timeout = 0; server->sasl_success = FALSE; - signal_emit__server_sasl_failure((SERVER_REC *)server, "The authentication timed out"); + SIGNAL_EMIT(server_sasl_failure, (SERVER_REC *)server, "The authentication timed out"); return FALSE; } @@ -94,7 +94,7 @@ static void sasl_fail(IRC_SERVER_REC *server, const char *data, const char *from server->sasl_success = FALSE; - signal_emit__server_sasl_failure((SERVER_REC *)server, error); + SIGNAL_EMIT(server_sasl_failure, (SERVER_REC *)server, error); /* Terminate the negotiation */ cap_finish_negotiation(server); @@ -108,7 +108,7 @@ static void sasl_already(IRC_SERVER_REC *server, const char *data, const char *f server->sasl_success = TRUE; - signal_emit__server_sasl_success((SERVER_REC *)server); + SIGNAL_EMIT(server_sasl_success, (SERVER_REC *)server); /* We're already authenticated, do nothing */ cap_finish_negotiation(server); @@ -120,7 +120,7 @@ static void sasl_success(IRC_SERVER_REC *server, const char *data, const char *f server->sasl_success = TRUE; - signal_emit__server_sasl_success((SERVER_REC *)server); + SIGNAL_EMIT(server_sasl_success, (SERVER_REC *)server); /* The authentication succeeded, time to finish the CAP negotiation */ cap_finish_negotiation(server); @@ -268,7 +268,7 @@ static void sasl_step_fail(IRC_SERVER_REC *server) sasl_timeout_stop(server); - signal_emit__server_sasl_failure((SERVER_REC *)server, "The server sent an invalid payload"); + SIGNAL_EMIT(server_sasl_failure, (SERVER_REC *)server, "The server sent an invalid payload"); } static void sasl_step(IRC_SERVER_REC *server, const char *data, const char *from) @@ -313,7 +313,7 @@ static void sig_sasl_over(IRC_SERVER_REC *server) server->connrec->sasl_mechanism != SASL_MECHANISM_NONE) { if (server->cap_supported == NULL || !g_hash_table_lookup_extended(server->cap_supported, "sasl", NULL, NULL)) { - signal_emit__server_sasl_failure((SERVER_REC *)server, "The server did not offer SASL"); + SIGNAL_EMIT(server_sasl_failure, (SERVER_REC *)server, "The server did not offer SASL"); } if (settings_get_bool("sasl_disconnect_on_failure")) { diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c index 98e55292..4cc54a18 100644 --- a/src/irc/dcc/dcc-autoget.c +++ b/src/irc/dcc/dcc-autoget.c @@ -76,7 +76,7 @@ static void sig_dcc_request(GET_DCC_REC *dcc, const char *nickaddr) stat(file, &statbuf) == 0 ? "RESUME %s \"%s\"" : "GET %s \"%s\"", dcc->nick, esc_arg); - signal_emit__command_("dcc", str, (SERVER_REC *)dcc->server, NULL); + SIGNAL_EMIT_(command, "dcc", str, (SERVER_REC *)dcc->server, NULL); g_free(esc_arg); g_free(file); g_free(str); diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c index 7a73b9d8..0ed01b1b 100644 --- a/src/irc/dcc/dcc-chat.c +++ b/src/irc/dcc/dcc-chat.c @@ -325,7 +325,7 @@ void dcc_chat_input(CHAT_DCC_REC *dcc) dcc->transfd += ret; recoded = recode_in(SERVER(dcc->server), str, dcc->nick); - signal_emit__dcc_chat_message(dcc, recoded); + SIGNAL_EMIT(dcc_chat_message, dcc, recoded); g_free(recoded); } } while (ret > 0); @@ -360,7 +360,7 @@ static void dcc_chat_listen(CHAT_DCC_REC *dcc) dcc->tagread = g_input_add(handle, G_INPUT_READ, (GInputFunction) dcc_chat_input, dcc); - signal_emit__dcc_connected((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dcc); } /* callback: DCC CHAT - net_connect_nonblock() finished */ @@ -370,7 +370,7 @@ static void sig_chat_connected(CHAT_DCC_REC *dcc) if (net_geterror(dcc->handle) != 0) { /* error connecting */ - signal_emit__dcc_error_connect((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_error_connect, (DCC_REC *)dcc); dcc_destroy(DCC(dcc)); return; } @@ -384,7 +384,7 @@ static void sig_chat_connected(CHAT_DCC_REC *dcc) dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ, (GInputFunction) dcc_chat_input, dcc); - signal_emit__dcc_connected((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dcc); } static void dcc_chat_connect(CHAT_DCC_REC *dcc) @@ -404,7 +404,7 @@ static void dcc_chat_connect(CHAT_DCC_REC *dcc) (GInputFunction) sig_chat_connected, dcc); } else { /* error connecting */ - signal_emit__dcc_error_connect((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_error_connect, (DCC_REC *)dcc); dcc_destroy(DCC(dcc)); } } @@ -514,7 +514,7 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server) (GInputFunction) dcc_chat_listen, dcc); /* send the chat request */ - signal_emit__dcc_request_send((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_request_send, (DCC_REC *)dcc); dcc_ip2str(&own_ip, host); irc_send_cmdv(server, "PRIVMSG %s :\001DCC CHAT CHAT %s %d\001", @@ -523,7 +523,7 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server) /* Passive protocol... we want the other side to listen */ /* send the chat request */ dcc->port = 0; - signal_emit__dcc_request_send((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_request_send, (DCC_REC *)dcc); /* generate a random id */ p_id = rand() % 64; @@ -605,7 +605,7 @@ static void cmd_whois(const char *data, SERVER_REC *server, if (*data == '\0') { dcc = item_get_dcc(item); if (dcc != NULL) { - signal_emit__command_("whois", dcc->nick, server, item); + SIGNAL_EMIT_(command, "whois", dcc->nick, server, item); signal_stop(); } } @@ -688,7 +688,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data, dcc_str2ip(params[1], &dcc->addr); net_ip2host(&dcc->addr, dcc->addrstr); - signal_emit__dcc_request((DCC_REC *)dcc, addr); + SIGNAL_EMIT(dcc_request, (DCC_REC *)dcc, addr); if (autoallow || DCC_CHAT_AUTOACCEPT(dcc, server, nick, addr)) { if (passive) { @@ -742,13 +742,13 @@ static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg) ascii_strdown(event+9); emitted = reply ? - signal_emit__dcc_reply_(msg+1, dcc, ptr) : - signal_emit__dcc_ctcp_(msg+1, dcc, ptr); + SIGNAL_EMIT_(dcc_reply, msg+1, dcc, ptr) : + SIGNAL_EMIT_(dcc_ctcp, msg+1, dcc, ptr); if (!emitted) { if (reply) - signal_emit__default_dcc_reply(dcc, cmd, ptr); + SIGNAL_EMIT(default_dcc_reply, dcc, cmd, ptr); else - signal_emit__default_dcc_ctcp(dcc, cmd, ptr); + SIGNAL_EMIT(default_dcc_ctcp, dcc, cmd, ptr); } g_free(cmd); @@ -762,7 +762,7 @@ static void dcc_ctcp_redirect(CHAT_DCC_REC *dcc, const char *msg) g_return_if_fail(msg != NULL); g_return_if_fail(IS_DCC_CHAT(dcc)); - signal_emit__ctcp_msg_dcc(dcc->server, msg, + SIGNAL_EMIT(ctcp_msg_dcc, dcc->server, msg, dcc->nick, "dcc", dcc->mynick, (DCC_REC *)dcc); } @@ -771,7 +771,7 @@ static void dcc_ctcp_reply_redirect(CHAT_DCC_REC *dcc, const char *msg) g_return_if_fail(msg != NULL); g_return_if_fail(IS_DCC_CHAT(dcc)); - signal_emit__ctcp_reply_dcc(dcc->server, msg, + SIGNAL_EMIT(ctcp_reply_dcc, dcc->server, msg, dcc->nick, "dcc", dcc->mynick, (DCC_REC *)dcc); } diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c index 50ca4508..89ba1cd7 100644 --- a/src/irc/dcc/dcc-get.c +++ b/src/irc/dcc/dcc-get.c @@ -174,7 +174,7 @@ static void sig_dccget_receive(GET_DCC_REC *dcc) if (write(dcc->fhandle, dcc_get_recv_buffer, ret) != ret) { /* most probably out of disk space */ - signal_emit__dcc_error_write((DCC_REC *)dcc, g_strerror(errno)); + SIGNAL_EMIT(dcc_error_write, (DCC_REC *)dcc, g_strerror(errno)); dcc_close(DCC(dcc)); return; } @@ -185,7 +185,7 @@ static void sig_dccget_receive(GET_DCC_REC *dcc) if (dcc->count_pos <= 0) dcc_get_send_received(dcc); - signal_emit__dcc_transfer_update((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_transfer_update, (DCC_REC *)dcc); } /* callback: net_connect() finished for DCC GET */ @@ -198,7 +198,7 @@ void sig_dccget_connected(GET_DCC_REC *dcc) if (!dcc->from_dccserver) { if (net_geterror(dcc->handle) != 0) { /* error connecting */ - signal_emit__dcc_error_connect((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_error_connect, (DCC_REC *)dcc); dcc_destroy(DCC(dcc)); return; } @@ -211,7 +211,7 @@ void sig_dccget_connected(GET_DCC_REC *dcc) dcc->file = dcc_get_download_path(dcc->arg); /* if some plugin wants to change the file name/path here.. */ - signal_emit__dcc_get_receive(dcc); + SIGNAL_EMIT(dcc_get_receive, dcc); if (stat(dcc->file, &statbuf) == 0 && dcc->get_type == DCC_GET_RENAME) { @@ -274,7 +274,7 @@ void sig_dccget_connected(GET_DCC_REC *dcc) g_free(tempfname); if (dcc->fhandle == -1) { - signal_emit__dcc_error_file_create((DCC_REC *)dcc, dcc->file, g_strerror(ret_errno)); + SIGNAL_EMIT(dcc_error_file_create, (DCC_REC *)dcc, dcc->file, g_strerror(ret_errno)); dcc_destroy(DCC(dcc)); return; } @@ -287,7 +287,7 @@ void sig_dccget_connected(GET_DCC_REC *dcc) } dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ, (GInputFunction) sig_dccget_receive, dcc); - signal_emit__dcc_connected((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dcc); if (dcc->from_dccserver) { str = g_strdup_printf("121 %s %d\n", @@ -318,7 +318,7 @@ void dcc_get_connect(GET_DCC_REC *dcc) dcc); } else { /* error connecting */ - signal_emit__dcc_error_connect((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_error_connect, (DCC_REC *)dcc); dcc_destroy(DCC(dcc)); } } @@ -451,7 +451,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data, paramcount = g_strv_length(params); if (paramcount < 4) { - signal_emit__dcc_error_ctcp("SEND", data, + SIGNAL_EMIT(dcc_error_ctcp, "SEND", data, nick, addr, target); g_strfreev(params); return; @@ -504,7 +504,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data, /* This new signal is added to let us invoke dcc_send_connect() which is found in dcc-send.c */ - signal_emit__dcc_send_pasv(temp_dcc); + SIGNAL_EMIT(dcc_send_pasv, temp_dcc); g_free(address); g_free(fname); return; @@ -545,7 +545,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data, dcc->size = size; dcc->file_quoted = quoted; - signal_emit__dcc_request((DCC_REC *)dcc, addr); + SIGNAL_EMIT(dcc_request, (DCC_REC *)dcc, addr); g_free(address); g_free(fname); @@ -598,7 +598,7 @@ void cmd_dcc_receive(const char *data, DCC_GET_FUNC accept_func, } if (!found) - signal_emit__dcc_error_get_not_found(nick); + SIGNAL_EMIT(dcc_error_get_not_found, nick); cmd_params_free(free_arg); } diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c index c3203c7b..b8d53c8f 100644 --- a/src/irc/dcc/dcc-resume.c +++ b/src/irc/dcc/dcc-resume.c @@ -140,7 +140,7 @@ static void ctcp_msg_dcc_resume(IRC_SERVER_REC *server, const char *data, int pasv_id = -1; if (!dcc_ctcp_resume_parse(DCC_SEND_TYPE, data, nick, &dcc, &size, &pasv_id)) { - signal_emit__dcc_error_ctcp("RESUME", data, + SIGNAL_EMIT(dcc_error_ctcp, "RESUME", data, nick, addr, target); } else if (dcc != NULL && dcc_resume_file_check(dcc, server, size)) { if (!dcc_is_passive(dcc)) { @@ -171,7 +171,7 @@ static void ctcp_msg_dcc_accept(IRC_SERVER_REC *server, const char *data, if (!dcc_ctcp_resume_parse(DCC_GET_TYPE, data, nick, &dcc, &size, &pasv_id) || (dcc != NULL && DCC_GET(dcc)->get_type != DCC_GET_RESUME)) { - signal_emit__dcc_error_ctcp("ACCEPT", data, + SIGNAL_EMIT(dcc_error_ctcp, "ACCEPT", data, nick, addr, target); } else if (dcc != NULL && dcc_resume_file_check(dcc, server, size)) { if (!dcc_is_passive(dcc)) @@ -192,7 +192,7 @@ static void dcc_send_resume(GET_DCC_REC *dcc) dcc->file = dcc_get_download_path(dcc->arg); dcc->fhandle = open(dcc->file, O_WRONLY); if (dcc->fhandle == -1) { - signal_emit__dcc_error_file_open(dcc->nick, dcc->file, + SIGNAL_EMIT(dcc_error_file_open, dcc->nick, dcc->file, GINT_TO_POINTER(errno)); return; } diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c index 2d5653c3..8c90d118 100644 --- a/src/irc/dcc/dcc-send.c +++ b/src/irc/dcc/dcc-send.c @@ -56,7 +56,7 @@ static void dcc_queue_send_next(int queue) if (server == NULL && qrec->chat == NULL) { /* no way to send this request */ - signal_emit__dcc_error_send_no_route(qrec->nick, qrec->file); + SIGNAL_EMIT(dcc_error_send_no_route, qrec->nick, qrec->file); } else { send_started = dcc_send_one_file(queue, qrec->nick, qrec->file, server, @@ -130,7 +130,7 @@ static void dcc_send_add(const char *servertag, CHAT_DCC_REC *chat, } if (ret < 0) { - signal_emit__dcc_error_file_open(nick, fname, GINT_TO_POINTER(errno)); + SIGNAL_EMIT(dcc_error_file_open, nick, fname, GINT_TO_POINTER(errno)); g_free(fname); continue; } @@ -278,7 +278,7 @@ static void dcc_send_data(SEND_DCC_REC *dcc) lseek(dcc->fhandle, dcc->transfd, SEEK_SET); - signal_emit__dcc_transfer_update((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_transfer_update, (DCC_REC *)dcc); } /* input function: DCC SEND - received some data */ @@ -341,7 +341,7 @@ static void dcc_send_connected(SEND_DCC_REC *dcc) dcc->tagwrite = g_input_add(handle, G_INPUT_WRITE, (GInputFunction) dcc_send_data, dcc); - signal_emit__dcc_connected((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dcc); } /* input function: DCC SEND - connect to the receiver (passive protocol) */ @@ -358,10 +358,10 @@ static void dcc_send_connect(SEND_DCC_REC *dcc) dcc->tagwrite = g_input_add(dcc->handle, G_INPUT_WRITE, (GInputFunction) dcc_send_data, dcc); - signal_emit__dcc_connected((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dcc); } else { /* error connecting */ - signal_emit__dcc_error_connect((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_error_connect, (DCC_REC *)dcc); dcc_destroy(DCC(dcc)); } } @@ -379,7 +379,7 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname, GIOChannel *handle; if (dcc_find_request(DCC_SEND_TYPE, target, fname)) { - signal_emit__dcc_error_send_exists(target, fname); + SIGNAL_EMIT(dcc_error_send_exists, target, fname); return FALSE; } @@ -388,7 +388,7 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname, g_free(str); if (hfile == -1) { - signal_emit__dcc_error_file_open(target, fname, + SIGNAL_EMIT(dcc_error_file_open, target, fname, GINT_TO_POINTER(errno)); return FALSE; } @@ -446,7 +446,7 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname, } /* send DCC request */ - signal_emit__dcc_request_send((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_request_send, (DCC_REC *)dcc); dcc_ip2str(&own_ip, host); if (passive == FALSE) { diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c index 54da8098..4db88067 100644 --- a/src/irc/dcc/dcc-server.c +++ b/src/irc/dcc/dcc-server.c @@ -81,7 +81,7 @@ static void dcc_server_input(SERVER_DCC_REC *dcc) if (ret > 0) { dcc->transfd += ret; - signal_emit__dcc_server_message(dcc, str); + SIGNAL_EMIT(dcc_server_message, dcc, str); } if (dcc->connection_established) { @@ -130,7 +130,7 @@ static void dcc_init_server_rec(SERVER_DCC_REC *dcc, IRC_SERVER_REC *server, dcc->servertag = g_strdup(servertag); dcc_conns = g_slist_append(dcc_conns, dcc); - signal_emit__dcc_created((DCC_REC *)dcc); + SIGNAL_EMIT(dcc_created, (DCC_REC *)dcc); } static SERVER_DCC_REC *dcc_server_create(IRC_SERVER_REC *server, const char *flags) @@ -188,7 +188,7 @@ static void dcc_server_listen(SERVER_DCC_REC *dcc) newdcc->tagread = g_input_add(handle, G_INPUT_READ, (GInputFunction) dcc_server_input, newdcc); - signal_emit__dcc_connected((DCC_REC *)newdcc); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)newdcc); } /* DCC SERVER: text received */ @@ -216,7 +216,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg) (GInputFunction) dcc_chat_input, dccchat); dcc->connection_established = 1; - signal_emit__dcc_connected((DCC_REC *)dccchat); + SIGNAL_EMIT(dcc_connected, (DCC_REC *)dccchat); str = g_strdup_printf("101 %s\n", (dccchat->server) ? dccchat->server->nick : "??"); @@ -283,7 +283,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg) dccget->from_dccserver = 1; dcc->connection_established = 1; - signal_emit__dcc_request((DCC_REC *)dccget, dccget->addrstr); + SIGNAL_EMIT(dcc_request, (DCC_REC *)dccget, dccget->addrstr); g_strfreev(params); g_free(fname); @@ -352,7 +352,7 @@ static void cmd_dcc_server(const char *data, IRC_SERVER_REC *server) dcc->tagconn = g_input_add(dcc->handle, G_INPUT_READ, (GInputFunction) dcc_server_listen, dcc); - signal_emit__dcc_server_started(dcc); + SIGNAL_EMIT(dcc_server_started, dcc); cmd_params_free(free_arg); } diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c index 6e9c5d4d..4897bf40 100644 --- a/src/irc/dcc/dcc.c +++ b/src/irc/dcc/dcc.c @@ -97,7 +97,7 @@ void dcc_init_rec(DCC_REC *dcc, IRC_SERVER_REC *server, CHAT_DCC_REC *chat, dcc->pasv_id = -1; /* Not a passive DCC */ dcc_conns = g_slist_append(dcc_conns, dcc); - signal_emit__dcc_created(dcc); + SIGNAL_EMIT(dcc_created, dcc); } /* Destroy DCC record */ @@ -109,7 +109,7 @@ void dcc_destroy(DCC_REC *dcc) dcc_conns = g_slist_remove(dcc_conns, dcc); dcc->destroyed = TRUE; - signal_emit__dcc_destroyed(dcc); + SIGNAL_EMIT(dcc_destroyed, dcc); if (dcc->handle != NULL) net_disconnect(dcc->handle); if (dcc->tagconn != -1) g_source_remove(dcc->tagconn); @@ -339,7 +339,7 @@ static void ctcp_msg(IRC_SERVER_REC *server, const char *data, return; data += 4; - signal_emit__ctcp_msg_("dcc", server, data, nick, addr, target); + SIGNAL_EMIT_(ctcp_msg, "dcc", server, data, nick, addr, target); signal_stop(); } @@ -352,7 +352,7 @@ static void ctcp_reply(IRC_SERVER_REC *server, const char *data, return; data += 4; - signal_emit__ctcp_reply_("dcc", server, data, nick, addr, target); + SIGNAL_EMIT_(ctcp_reply, "dcc", server, data, nick, addr, target); signal_stop(); } @@ -371,8 +371,8 @@ static void ctcp_msg_dcc(IRC_SERVER_REC *server, const char *data, if (args != NULL) *args++ = '\0'; else args = ""; ascii_strdown(str+13); - if (!signal_emit__ctcp_msg_dcc_(data, server, args, nick, addr, target, chat)) { - signal_emit__default_ctcp_msg_dcc(server, data, nick, addr, target, chat); + if (!SIGNAL_EMIT_(ctcp_msg_dcc, data, server, args, nick, addr, target, chat)) { + SIGNAL_EMIT(default_ctcp_msg_dcc, server, data, nick, addr, target, chat); } g_free(str); } @@ -392,8 +392,8 @@ static void ctcp_reply_dcc(IRC_SERVER_REC *server, const char *data, if (args != NULL) *args++ = '\0'; else args = ""; ascii_strdown(str+15); - if (!signal_emit__ctcp_reply_dcc_(data, server, args, nick, addr, target)) { - signal_emit__default_ctcp_reply_dcc(server, data, nick, addr, target); + if (!SIGNAL_EMIT_(ctcp_reply_dcc, data, server, args, nick, addr, target)) { + SIGNAL_EMIT(default_ctcp_reply_dcc, server, data, nick, addr, target); } g_free(str); } @@ -418,7 +418,7 @@ static void ctcp_reply_dcc_reject(IRC_SERVER_REC *server, const char *data, void dcc_close(DCC_REC *dcc) { - signal_emit__dcc_closed(dcc); + SIGNAL_EMIT(dcc_closed, dcc); dcc_destroy(dcc); } @@ -427,7 +427,7 @@ void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server) { g_return_if_fail(dcc != NULL); - signal_emit__dcc_rejected(dcc); + SIGNAL_EMIT(dcc_rejected, dcc); if (dcc->server != NULL) server = dcc->server; @@ -506,7 +506,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server) ascii_strup(typestr); type = dcc_str2type(typestr); if (type == -1) { - signal_emit__dcc_error_unknown_type(typestr); + SIGNAL_EMIT(dcc_error_unknown_type, typestr); cmd_params_free(free_arg); return; } @@ -526,7 +526,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server) } if (!found) { - signal_emit__dcc_error_close_not_found(typestr, nick, arg); + SIGNAL_EMIT(dcc_error_close_not_found, typestr, nick, arg); } cmd_params_free(free_arg); diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c index aabcc02f..dc7d4858 100644 --- a/src/irc/flood/flood.c +++ b/src/irc/flood/flood.c @@ -214,7 +214,7 @@ static void flood_newmsg(IRC_SERVER_REC *server, int level, const char *nick, rec->msgtimes = g_slist_append(rec->msgtimes, ttime); if (g_slist_length(rec->msgtimes) > flood_max_msgs) { /* flooding! */ - signal_emit__flood((SERVER_REC *)server, nick, host, + SIGNAL_EMIT(flood, (SERVER_REC *)server, nick, host, GINT_TO_POINTER(rec->level), target); } return; diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c index 74a75080..45816f50 100644 --- a/src/irc/notifylist/notifylist.c +++ b/src/irc/notifylist/notifylist.c @@ -51,7 +51,7 @@ NOTIFYLIST_REC *notifylist_add(const char *mask, const char *ircnets, notifylist_add_config(rec); notifies = g_slist_append(notifies, rec); - signal_emit__notifylist_new(rec); + SIGNAL_EMIT(notifylist_new, rec); return rec; } @@ -81,7 +81,7 @@ void notifylist_remove(const char *mask) notifylist_remove_config(rec); notifies = g_slist_remove(notifies, rec); - signal_emit__notifylist_remove(rec); + SIGNAL_EMIT(notifylist_remove, rec); notify_destroy(rec); } @@ -228,7 +228,7 @@ void notifylist_left(IRC_SERVER_REC *server, NOTIFY_NICK_REC *rec) mserver->notify_users = g_slist_remove(mserver->notify_users, rec); if (rec->host_ok && rec->away_ok) { - signal_emit__notifylist_left((SERVER_REC *)server, rec->nick, + SIGNAL_EMIT(notifylist_left, (SERVER_REC *)server, rec->nick, rec->user, rec->host, rec->realname, rec->awaymsg); } @@ -291,7 +291,7 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick, rec->join_announced = TRUE; rec->away_ok = !notify->away_check || !rec->away; - signal_emit__notifylist_joined((SERVER_REC *)server, rec->nick, rec->user, rec->host, realname, NULL); + SIGNAL_EMIT(notifylist_joined, (SERVER_REC *)server, rec->nick, rec->user, rec->host, realname, NULL); g_free(user); } diff --git a/src/irc/proxy/listen.c b/src/irc/proxy/listen.c index 19c7d49a..98622dd3 100644 --- a/src/irc/proxy/listen.c +++ b/src/irc/proxy/listen.c @@ -108,7 +108,7 @@ static void remove_client(CLIENT_REC *rec) proxy_clients = g_slist_remove(proxy_clients, rec); rec->listen->clients = g_slist_remove(rec->listen->clients, rec); - signal_emit__proxy_client_disconnected(rec); + SIGNAL_EMIT(proxy_client_disconnected, rec); printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE, "Proxy: Client %s disconnected", rec->addr); @@ -220,7 +220,7 @@ static void handle_client_connect_cmd(CLIENT_REC *client, /* client didn't send us PASS, kill it */ remove_client(client); } else { - signal_emit__proxy_client_connected(client); + SIGNAL_EMIT(proxy_client_connected, client); printtext(client->server, NULL, MSGLEVEL_CLIENTNOTICE, "Proxy: Client %s connected", client->addr); @@ -286,7 +286,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args, proxy_outdata(client, ":%s NOTICE %s :Proxy is now handling itself CTCPs sent to %s\r\n", client->proxy_address, client->nick, client->listen->ircnet); } else { - signal_emit__proxy_client_command(client, args, data); + SIGNAL_EMIT(proxy_client_command, client, args, data); } return; } @@ -366,7 +366,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args, } else if (strncmp(msg+1, "ACTION ", 7) == 0) { /* action */ msg[strlen(msg)-1] = '\0'; - signal_emit__message_irc_own_action(client->server, msg+8, target); + SIGNAL_EMIT(message_irc_own_action, client->server, msg+8, target); } else { /* CTCP */ char *p; @@ -375,7 +375,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args, p = strchr(msg, ' '); if (p != NULL) *p++ = '\0'; else p = ""; - signal_emit__message_irc_own_ctcp(client->server, msg+1, p, target); + SIGNAL_EMIT(message_irc_own_ctcp, client->server, msg+1, p, target); } ignore_next = FALSE; g_free(params); @@ -472,7 +472,7 @@ static void sig_listen(LISTEN_REC *listen) proxy_clients = g_slist_prepend(proxy_clients, rec); listen->clients = g_slist_prepend(listen->clients, rec); - signal_emit__proxy_client_connecting(rec); + SIGNAL_EMIT(proxy_client_connecting, rec); printtext(rec->server, NULL, MSGLEVEL_CLIENTNOTICE, "Proxy: New client %s on port %s (%s)", rec->addr, listen->port_or_path, listen->ircnet); diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c index 19268f82..c4985593 100644 --- a/src/irc/proxy/proxy.c +++ b/src/irc/proxy/proxy.c @@ -80,13 +80,13 @@ void irc_proxy_init(void) if (*settings_get_str("irssiproxy_password") == '\0') { /* no password - bad idea! */ - signal_emit__gui_dialog("warning", + SIGNAL_EMIT(gui_dialog, "warning", "Warning!! Password not specified, everyone can " "use this proxy! Use /set irssiproxy_password " " to set it"); } if (*settings_get_str("irssiproxy_ports") == '\0') { - signal_emit__gui_dialog("warning", + SIGNAL_EMIT(gui_dialog, "warning", "No proxy ports specified. Use /SET " "irssiproxy_ports = = " "... to set them."); diff --git a/src/otr/otr-module.c b/src/otr/otr-module.c index f7939773..aac8c976 100644 --- a/src/otr/otr-module.c +++ b/src/otr/otr-module.c @@ -104,7 +104,7 @@ void sig_message_private(SERVER_REC *server, const char *msg, const char *nick, */ if (strncmp(new_msg, OTR_IRC_MARKER_ME, OTR_IRC_MARKER_ME_LEN) == 0) { signal_stop(); - signal_emit__message_irc_action((IRC_SERVER_REC *)server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick); + SIGNAL_EMIT(message_irc_action, (IRC_SERVER_REC *)server, new_msg + OTR_IRC_MARKER_ME_LEN, nick, address, nick); } else { /* OTR received message */ signal_continue(5, server, new_msg, nick, address, target); @@ -170,7 +170,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server, otrl_message_free(otrmsg); } - signal_emit__message_irc_own__action((IRC_SERVER_REC *)server, data, item->visible_name); + SIGNAL_EMIT(message_irc_own__action, (IRC_SERVER_REC *)server, data, item->visible_name); } /* diff --git a/src/otr/otr-ops.c b/src/otr/otr-ops.c index 20f7f5e4..d3bbf5a3 100644 --- a/src/otr/otr-ops.c +++ b/src/otr/otr-ops.c @@ -187,7 +187,7 @@ static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event, ConnC * submit a patch or email me a better way. */ signal_remove__message_private(sig_message_private); - signal_emit__message_private(server, message, username, server->connrec->address, server->nick); + SIGNAL_EMIT(message_private, server, message, username, server->connrec->address, server->nick); signal_add_first__message_private(sig_message_private); break; case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED: diff --git a/src/otr/otr.c b/src/otr/otr.c index bc5d3d87..95258411 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -813,7 +813,7 @@ void otr_status_change(SERVER_REC *server, const char *nick, enum otr_status_event event) { statusbar_items_redraw("otr"); - signal_emit__otr_event(server, nick, statusbar_txt[event]); + SIGNAL_EMIT(otr_event, server, nick, statusbar_txt[event]); } /* diff --git a/src/perl/common/Expando.xs b/src/perl/common/Expando.xs index cfd7dbde..235bae07 100644 --- a/src/perl/common/Expando.xs +++ b/src/perl/common/Expando.xs @@ -88,7 +88,7 @@ static char *perl_expando_event(PerlExpando *rec, SERVER_REC *server, /* rec has been freed now */ error = g_strdup(SvPV_nolen(ERRSV)); - signal_emit__script_error(script, error); + SIGNAL_EMIT(script_error, script, error); g_free(error); } else if (retcount > 0) { ret = g_strdup(POPp); diff --git a/src/perl/perl-common.c b/src/perl/perl-common.c index 4ed13d75..37113b65 100644 --- a/src/perl/perl-common.c +++ b/src/perl/perl-common.c @@ -558,7 +558,7 @@ void perl_command(const char *cmd, SERVER_REC *server, WI_ITEM_REC *item) remove_newlines(sendcmd); } - signal_emit__send_command(sendcmd, server, item); + SIGNAL_EMIT(send_command, sendcmd, server, item); if (sendcmd != cmd) g_free(sendcmd); } diff --git a/src/perl/perl-core.c b/src/perl/perl-core.c index 5991f0ac..157fa0eb 100644 --- a/src/perl/perl-core.c +++ b/src/perl/perl-core.c @@ -430,8 +430,8 @@ static void sig_script_error(PERL_SCRIPT_REC *script, const char *error) if (print_script_errors) { str = g_strdup_printf("Script '%s' error:", script == NULL ? "??" : script->name); - signal_emit__gui_dialog("error", str); - signal_emit__gui_dialog("error", error); + SIGNAL_EMIT(gui_dialog, "error", str); + SIGNAL_EMIT(gui_dialog, "error", error); g_free(str); } diff --git a/src/perl/perl-signals.c b/src/perl/perl-signals.c index fbb13378..ae5877b3 100644 --- a/src/perl/perl-signals.c +++ b/src/perl/perl-signals.c @@ -304,7 +304,7 @@ static void perl_call_signal(PERL_SCRIPT_REC *script, SV *func, if (SvTRUE(ERRSV)) { char *error = g_strdup(SvPV_nolen(ERRSV)); - signal_emit__script_error(script, error); + SIGNAL_EMIT(script_error, script, error); g_free(error); rec = NULL; } diff --git a/src/perl/perl-sources.c b/src/perl/perl-sources.c index d65dbf16..6941006e 100644 --- a/src/perl/perl-sources.c +++ b/src/perl/perl-sources.c @@ -83,7 +83,7 @@ static int perl_source_event(PERL_SOURCE_REC *rec) if (SvTRUE(ERRSV)) { char *error = g_strdup(SvPV_nolen(ERRSV)); - signal_emit__script_error(rec->script, error); + SIGNAL_EMIT(script_error, rec->script, error); g_free(error); } diff --git a/src/perl/textui/Statusbar.xs b/src/perl/textui/Statusbar.xs index 6cadf271..fa733d14 100644 --- a/src/perl/textui/Statusbar.xs +++ b/src/perl/textui/Statusbar.xs @@ -80,7 +80,7 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item, } error = g_strdup(SvPV_nolen(ERRSV)); - signal_emit__script_error(script, error); + SIGNAL_EMIT(script_error, script, error); g_free(error); } else { /* min_size and max_size can be changed, move them to SBAR_ITEM_REC */ diff --git a/tests/irc/core/test-channel-events.c b/tests/irc/core/test-channel-events.c index 68746ffb..045ad57b 100644 --- a/tests/irc/core/test-channel-events.c +++ b/tests/irc/core/test-channel-events.c @@ -142,7 +142,7 @@ static void test_event_topic_get(topic_test_case const *const test) { setup(); - signal_emit__event_("332", (SERVER_REC *)server, test->input, NULL, NULL); + SIGNAL_EMIT_(event, "332", (SERVER_REC *)server, test->input, NULL, NULL); g_assert_cmpstr(channel->topic, ==, test->topic); g_assert_cmpstr(channel->topic_by, ==, test->topic_by); @@ -158,7 +158,7 @@ static void test_event_topic(topic_test_case const *const test) setup(); now = time(NULL); - signal_emit__event_("topic", (SERVER_REC *)server, test->input, "newnick", + SIGNAL_EMIT_(event, "topic", (SERVER_REC *)server, test->input, "newnick", "user@example.com"); g_assert_cmpstr(channel->topic, ==, test->topic); @@ -172,7 +172,7 @@ static void test_event_topic_info(topic_test_case const *const test) { setup(); - signal_emit__event_("333", (SERVER_REC *)server, test->input, NULL, NULL); + SIGNAL_EMIT_(event, "333", (SERVER_REC *)server, test->input, NULL, NULL); g_assert_cmpstr(channel->topic, ==, test->topic); g_assert_cmpstr(channel->topic_by, ==, test->topic_by); diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c index 05ca2562..ea778902 100644 --- a/tests/irc/flood/test-796.c +++ b/tests/irc/flood/test-796.c @@ -59,7 +59,7 @@ static void cmd_echo(const char *data, void *server, WI_ITEM_REC *item) static void sig_public(SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target) { - signal_emit__send_command("/eval echo $tag", server, NULL); + SIGNAL_EMIT(send_command, "/eval echo $tag", server, NULL); } static void print_disconnect(SERVER_REC *server) @@ -79,7 +79,7 @@ static void server_destroy_flood_set_up(ServerDestroyFloodData *fixture, const v irc_init(); fe_common_core_init(); fe_common_irc_init(); - signal_emit__irssi_init_finished(); + SIGNAL_EMIT(irssi_init_finished); command_bind("echo", NULL, (SIGNAL_FUNC) cmd_echo); signal_add__message_public(sig_public); signal_add__server_destroyed(print_destroyed); @@ -153,7 +153,7 @@ static void test_server_destroy_flood(ServerDestroyFloodData *fixture, const voi */ server_ref(server); - signal_emit__event_("privmsg", (SERVER_REC *)server, "#someroom :test message", "nick", "user@host"); + SIGNAL_EMIT_(event, "privmsg", (SERVER_REC *)server, "#someroom :test message", "nick", "user@host"); server_unref(server); g_log_set_always_fatal(loglev);