diff --git a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp index c28fde2d..23380130 100644 --- a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp +++ b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp @@ -138,25 +138,25 @@ void LobbyChat::chatError(int errorCode) QString errorMsg; switch (errorCode) { - case ERR_IRC_INTERNAL : - case ERR_IRC_SELECT_FAILED : - case ERR_IRC_RECV_FAILED : - case ERR_IRC_SEND_FAILED : - case ERR_IRC_INVALID_PARAM : - errorMsg = tr("An internal IRC error has occured:") + " " + QString::number(errorCode); - break; - case ERR_IRC_CONNECT_FAILED : - errorMsg = tr("Could not connect to the IRC server. Chat will be unavailable."); - break; - case ERR_IRC_TERMINATED : - errorMsg = tr("The IRC server terminated the connection. Chat will be unavailable."); - break; - case ERR_IRC_TIMEOUT : - errorMsg = tr("An IRC action timed out."); - break; - } - if (errorMsg.size()) - myLobby->textBrowser_ChatDisplay->append(errorMsg); + case ERR_IRC_INTERNAL : + case ERR_IRC_SELECT_FAILED : + case ERR_IRC_RECV_FAILED : + case ERR_IRC_SEND_FAILED : + case ERR_IRC_INVALID_PARAM : + errorMsg = tr("An internal IRC error has occured:") + " " + QString::number(errorCode); + break; + case ERR_IRC_CONNECT_FAILED : + errorMsg = tr("Could not connect to the IRC server. Chat will be unavailable."); + break; + case ERR_IRC_TERMINATED : + errorMsg = tr("The IRC server terminated the connection. Chat will be unavailable."); + break; + case ERR_IRC_TIMEOUT : + errorMsg = tr("An IRC action timed out."); + break; + } + if (errorMsg.size()) + myLobby->textBrowser_ChatDisplay->append(errorMsg); } void LobbyChat::chatServerError(int errorCode) @@ -214,10 +214,10 @@ void LobbyChat::chatServerError(int errorCode) case LIBIRC_RFC_ERR_NOOPERHOST : case LIBIRC_RFC_ERR_UMODEUNKNOWNFLAG : case LIBIRC_RFC_ERR_USERSDONTMATCH : - errorMsg = tr("The IRC server reported an error:") + " " + QString::number(errorCode); + errorMsg = tr("The IRC server reported an error:") + " " + QString::number(errorCode); break; } -// if (errorMsg.size()) -// myLobby->textBrowser_ChatDisplay->append(errorMsg); +// if (errorMsg.size()) +// myLobby->textBrowser_ChatDisplay->append(errorMsg); } diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp index 6b6af0e9..090619e1 100644 --- a/src/net/common/ircthread.cpp +++ b/src/net/common/ircthread.cpp @@ -79,12 +79,12 @@ void irc_notify_player_list(irc_session_t *session, const char *players) } } -void irc_handle_server_error(irc_session_t *session, unsigned irc_error_code) -{ +void irc_handle_server_error(irc_session_t *session, unsigned irc_error_code) +{ IrcContext *context = (IrcContext *) irc_get_ctx(session); context->ircThread.GetCallback().SignalIrcServerError(irc_error_code); -} +} void irc_event_connect(irc_session_t *session, const char *irc_event, const char *origin, const char **params, unsigned count) @@ -174,57 +174,57 @@ irc_event_numeric(irc_session_t * session, unsigned irc_event, const char *origi if (count >= 4) irc_notify_player_list(session, params[3]); break; - case LIBIRC_RFC_ERR_NOSUCHNICK : - case LIBIRC_RFC_ERR_NOSUCHCHANNEL : - case LIBIRC_RFC_ERR_CANNOTSENDTOCHAN : - case LIBIRC_RFC_ERR_TOOMANYCHANNELS : - case LIBIRC_RFC_ERR_WASNOSUCHNICK : - case LIBIRC_RFC_ERR_TOOMANYTARGETS : - case LIBIRC_RFC_ERR_NOSUCHSERVICE : - case LIBIRC_RFC_ERR_NOORIGIN : - case LIBIRC_RFC_ERR_NORECIPIENT : - case LIBIRC_RFC_ERR_NOTEXTTOSEND : - case LIBIRC_RFC_ERR_NOTOPLEVEL : - case LIBIRC_RFC_ERR_WILDTOPLEVEL : - case LIBIRC_RFC_ERR_BADMASK : - case LIBIRC_RFC_ERR_UNKNOWNCOMMAND : - case LIBIRC_RFC_ERR_NOMOTD : - case LIBIRC_RFC_ERR_NOADMININFO : - case LIBIRC_RFC_ERR_FILEERROR : - case LIBIRC_RFC_ERR_NONICKNAMEGIVEN : - case LIBIRC_RFC_ERR_ERRONEUSNICKNAME : - case LIBIRC_RFC_ERR_UNAVAILRESOURCE : - case LIBIRC_RFC_ERR_USERNOTINCHANNEL : - case LIBIRC_RFC_ERR_NOTONCHANNEL : - case LIBIRC_RFC_ERR_USERONCHANNEL : - case LIBIRC_RFC_ERR_NOLOGIN : - case LIBIRC_RFC_ERR_SUMMONDISABLED : - case LIBIRC_RFC_ERR_USERSDISABLED : - case LIBIRC_RFC_ERR_NOTREGISTERED : - case LIBIRC_RFC_ERR_NEEDMOREPARAMS : - case LIBIRC_RFC_ERR_ALREADYREGISTRED : - case LIBIRC_RFC_ERR_NOPERMFORHOST : - case LIBIRC_RFC_ERR_PASSWDMISMATCH : - case LIBIRC_RFC_ERR_YOUREBANNEDCREEP : - case LIBIRC_RFC_ERR_YOUWILLBEBANNED : - case LIBIRC_RFC_ERR_KEYSET : - case LIBIRC_RFC_ERR_CHANNELISFULL : - case LIBIRC_RFC_ERR_UNKNOWNMODE : - case LIBIRC_RFC_ERR_INVITEONLYCHAN : - case LIBIRC_RFC_ERR_BANNEDFROMCHAN : - case LIBIRC_RFC_ERR_BADCHANNELKEY : - case LIBIRC_RFC_ERR_BADCHANMASK : - case LIBIRC_RFC_ERR_NOCHANMODES : - case LIBIRC_RFC_ERR_BANLISTFULL : - case LIBIRC_RFC_ERR_NOPRIVILEGES : - case LIBIRC_RFC_ERR_CHANOPRIVSNEEDED : - case LIBIRC_RFC_ERR_CANTKILLSERVER : - case LIBIRC_RFC_ERR_RESTRICTED : - case LIBIRC_RFC_ERR_UNIQOPPRIVSNEEDED : - case LIBIRC_RFC_ERR_NOOPERHOST : - case LIBIRC_RFC_ERR_UMODEUNKNOWNFLAG : - case LIBIRC_RFC_ERR_USERSDONTMATCH : - irc_handle_server_error(session, irc_event); + case LIBIRC_RFC_ERR_NOSUCHNICK : + case LIBIRC_RFC_ERR_NOSUCHCHANNEL : + case LIBIRC_RFC_ERR_CANNOTSENDTOCHAN : + case LIBIRC_RFC_ERR_TOOMANYCHANNELS : + case LIBIRC_RFC_ERR_WASNOSUCHNICK : + case LIBIRC_RFC_ERR_TOOMANYTARGETS : + case LIBIRC_RFC_ERR_NOSUCHSERVICE : + case LIBIRC_RFC_ERR_NOORIGIN : + case LIBIRC_RFC_ERR_NORECIPIENT : + case LIBIRC_RFC_ERR_NOTEXTTOSEND : + case LIBIRC_RFC_ERR_NOTOPLEVEL : + case LIBIRC_RFC_ERR_WILDTOPLEVEL : + case LIBIRC_RFC_ERR_BADMASK : + case LIBIRC_RFC_ERR_UNKNOWNCOMMAND : + case LIBIRC_RFC_ERR_NOMOTD : + case LIBIRC_RFC_ERR_NOADMININFO : + case LIBIRC_RFC_ERR_FILEERROR : + case LIBIRC_RFC_ERR_NONICKNAMEGIVEN : + case LIBIRC_RFC_ERR_ERRONEUSNICKNAME : + case LIBIRC_RFC_ERR_UNAVAILRESOURCE : + case LIBIRC_RFC_ERR_USERNOTINCHANNEL : + case LIBIRC_RFC_ERR_NOTONCHANNEL : + case LIBIRC_RFC_ERR_USERONCHANNEL : + case LIBIRC_RFC_ERR_NOLOGIN : + case LIBIRC_RFC_ERR_SUMMONDISABLED : + case LIBIRC_RFC_ERR_USERSDISABLED : + case LIBIRC_RFC_ERR_NOTREGISTERED : + case LIBIRC_RFC_ERR_NEEDMOREPARAMS : + case LIBIRC_RFC_ERR_ALREADYREGISTRED : + case LIBIRC_RFC_ERR_NOPERMFORHOST : + case LIBIRC_RFC_ERR_PASSWDMISMATCH : + case LIBIRC_RFC_ERR_YOUREBANNEDCREEP : + case LIBIRC_RFC_ERR_YOUWILLBEBANNED : + case LIBIRC_RFC_ERR_KEYSET : + case LIBIRC_RFC_ERR_CHANNELISFULL : + case LIBIRC_RFC_ERR_UNKNOWNMODE : + case LIBIRC_RFC_ERR_INVITEONLYCHAN : + case LIBIRC_RFC_ERR_BANNEDFROMCHAN : + case LIBIRC_RFC_ERR_BADCHANNELKEY : + case LIBIRC_RFC_ERR_BADCHANMASK : + case LIBIRC_RFC_ERR_NOCHANMODES : + case LIBIRC_RFC_ERR_BANLISTFULL : + case LIBIRC_RFC_ERR_NOPRIVILEGES : + case LIBIRC_RFC_ERR_CHANOPRIVSNEEDED : + case LIBIRC_RFC_ERR_CANTKILLSERVER : + case LIBIRC_RFC_ERR_RESTRICTED : + case LIBIRC_RFC_ERR_UNIQOPPRIVSNEEDED : + case LIBIRC_RFC_ERR_NOOPERHOST : + case LIBIRC_RFC_ERR_UMODEUNKNOWNFLAG : + case LIBIRC_RFC_ERR_USERSDONTMATCH : + irc_handle_server_error(session, irc_event); break; } }