diff options
| author | Geert Hauwaerts <geert@irssi.org> | 2004-09-15 21:27:22 +0000 |
|---|---|---|
| committer | geert <geert@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2004-09-15 21:27:22 +0000 |
| commit | adfa7aff12b3b02f5429ea4adfc92202dba222f2 (patch) | |
| tree | 96a589e31d525475e38f976f1bbeea885f84a79e /src/irc/core/irc-servers.c | |
| parent | f888f2c9dccbc075b74203b6f8899dbdef0fda05 (diff) | |
| download | irssi-adfa7aff12b3b02f5429ea4adfc92202dba222f2.zip | |
Bugfix: http://bugs.irssi.org/?do=details&id=121
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3299 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/irc-servers.c')
| -rw-r--r-- | src/irc/core/irc-servers.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 85fbe7b8..2bdf7515 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -507,6 +507,17 @@ static int sig_set_user_mode(IRC_SERVER_REC *server) return 0; } +/* Bugfix: http://bugs.irssi.org/?do=details&id=121 + * Author: Geert Hauwaerts <geert@irssi.org> + * Date: Wed Sep 15 23:25:30 CEST 2004 + */ + +static void real_connected(IRC_SERVER_REC *server) +{ + if (server->connrec->usermode != NULL) + sig_set_user_mode(server); +} + static void event_connected(IRC_SERVER_REC *server, const char *data, const char *from) { char *params, *nick; @@ -531,11 +542,6 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char server->connected = 1; server->real_connect_time = time(NULL); - if (server->connrec->usermode != NULL) { - /* wait a second and then send the user mode */ - g_timeout_add(1000, (GSourceFunc) sig_set_user_mode, server); - } - signal_emit("event connected", 1, server); g_free(params); } @@ -776,6 +782,7 @@ void irc_servers_init(void) signal_add_first("server connected", (SIGNAL_FUNC) sig_connected); signal_add_last("server disconnected", (SIGNAL_FUNC) sig_disconnected); signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit); + signal_add_first("event connected", (SIGNAL_FUNC) real_connected); signal_add("event 001", (SIGNAL_FUNC) event_connected); signal_add("event 004", (SIGNAL_FUNC) event_server_info); signal_add("event 005", (SIGNAL_FUNC) event_isupport); @@ -800,7 +807,8 @@ void irc_servers_deinit(void) signal_remove("server connected", (SIGNAL_FUNC) sig_connected); signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected); - signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit); + signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit); + signal_remove("event connected", (SIGNAL_FUNC) real_connected); signal_remove("event 001", (SIGNAL_FUNC) event_connected); signal_remove("event 004", (SIGNAL_FUNC) event_server_info); signal_remove("event 005", (SIGNAL_FUNC) event_isupport); |