msgPermissionDenied is MainWindow independent

3 files changed, 80 insertions, 84 deletions

diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h
index c0c4c2e75..7c5bd3983 100644
--- a/src/mumble/MainWindow.h
+++ b/src/mumble/MainWindow.h
@@ -254,7 +254,6 @@ class MainWindow : public QMainWindow, public Ui::MainWindow {
 		void msgBanList(const MumbleProto::BanList &msg);
 		void msgReject(const MumbleProto::Reject &msg);
 		void msgServerSync(const MumbleProto::ServerSync &msg);
-		void msgPermissionDenied(const MumbleProto::PermissionDenied &msg);
 		void msgUserState(const MumbleProto::UserState &msg);
 		void msgUserRemove(const MumbleProto::UserRemove &msg);
 		void msgChannelState(const MumbleProto::ChannelState &msg);
diff --git a/src/mumble/MainWindowMessages.cpp b/src/mumble/MainWindowMessages.cpp
index a44ca1345..32e9d1787 100644
--- a/src/mumble/MainWindowMessages.cpp
+++ b/src/mumble/MainWindowMessages.cpp
@@ -141,88 +141,6 @@ void MainWindow::msgServerSync(const MumbleProto::ServerSync &msg) {
 }
 
 
-void MainWindow::msgPermissionDenied(const MumbleProto::PermissionDenied &msg) {
-	switch (msg.type()) {
-		case MumbleProto::PermissionDenied_DenyType_Permission: {
-				VICTIM_INIT;
-				SELF_INIT;
-				Channel *c = Channel::get(msg.channel_id());
-				if (! c)
-					return;
-				QString pname = ChanACL::permName(static_cast<ChanACL::Permissions>(msg.permission()));
-				if (pDst == pSelf)
-					g.l->log(Log::PermissionDenied, tr("You were denied %1 privileges in %2.").arg(Log::msgColor(pname, Log::Privilege)).arg(Log::formatChannel(c)));
-				else
-					g.l->log(Log::PermissionDenied, tr("%3 was denied %1 privileges in %2.").arg(Log::msgColor(pname, Log::Privilege)).arg(Log::formatChannel(c)).arg(Log::formatClientUser(pDst, Log::Target)));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_SuperUser: {
-				g.l->log(Log::PermissionDenied, tr("Denied: Cannot modify SuperUser."));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_ChannelName: {
-				g.l->log(Log::PermissionDenied, tr("Denied: Invalid channel name."));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_TextTooLong: {
-				g.l->log(Log::PermissionDenied, tr("Denied: Text message too long."));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_H9K: {
-				if (g.bHappyEaster) {
-					unsigned short p;
-					QString h, u, pw;
-					bool bold = g.s.bDeaf;
-					bool bold2 = g.s.bTTS;
-					g.sh->getConnectionInfo(h, p, u, pw);
-					g.s.bDeaf = false;
-					g.s.bTTS = true;
-					quint32 oflags = g.s.qmMessages.value(Log::PermissionDenied);
-					g.s.qmMessages[Log::PermissionDenied] = (oflags | Settings::LogTTS) & (~Settings::LogSoundfile);
-					g.l->log(Log::PermissionDenied, QString::fromAscii(g.ccHappyEaster + 39).arg(u));
-					g.s.qmMessages[Log::PermissionDenied] = oflags;
-					g.s.bDeaf = bold;
-					g.s.bTTS = bold2;
-					g.mw->setWindowIcon(QIcon(QLatin1String(g.ccHappyEaster)));
-					g.mw->setStyleSheet(QString::fromAscii(g.ccHappyEaster + 82));
-					qWarning() << "Happy Easter";
-				}
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_TemporaryChannel: {
-				g.l->log(Log::PermissionDenied, tr("Denied: Operation not permitted in temporary channel."));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_MissingCertificate: {
-				VICTIM_INIT;
-				SELF_INIT;
-				if (pDst == pSelf)
-					g.l->log(Log::PermissionDenied, tr("You need a certificate to perform this operation."));
-				else
-					g.l->log(Log::PermissionDenied, tr("%1 does not have a certificate.").arg(Log::formatClientUser(pDst, Log::Target)));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_UserName: {
-				if (msg.has_name())
-					g.l->log(Log::PermissionDenied, tr("Invalid username: %1.").arg(u8(msg.name())));
-				else
-					g.l->log(Log::PermissionDenied, tr("Invalid username."));
-			}
-			break;
-		case MumbleProto::PermissionDenied_DenyType_ChannelFull: {
-				g.l->log(Log::PermissionDenied, tr("Channel is full."));
-			}
-			break;
-		default: {
-				if (msg.has_reason())
-					g.l->log(Log::PermissionDenied, tr("Denied: %1.").arg(u8(msg.reason())));
-				else
-					g.l->log(Log::PermissionDenied, tr("Permission denied."));
-			}
-			break;
-	}
-}
-
 void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
 	ACTOR_INIT;
 	SELF_INIT;
diff --git a/src/mumble/MessageHandler.cpp b/src/mumble/MessageHandler.cpp
index e268942f2..b4bb6252e 100644
--- a/src/mumble/MessageHandler.cpp
+++ b/src/mumble/MessageHandler.cpp
@@ -40,6 +40,7 @@
 #include "ConversionHelpers.h"
 #include "Connection.h"
 #include "AudioInput.h"
+#include "Channel.h"
 
 #define ACTOR_INIT \
 	ClientUser *pSrc=NULL; \
@@ -126,7 +127,85 @@ void MessageHandler::msgServerConfig(const MumbleProto::ServerConfig &msg) {
 }
 
 void MessageHandler::msgPermissionDenied(const MumbleProto::PermissionDenied &msg) {
-	g.mw->msgPermissionDenied(msg);
+	switch (msg.type()) {
+		case MumbleProto::PermissionDenied_DenyType_Permission: {
+				VICTIM_INIT;
+				SELF_INIT;
+				Channel *c = Channel::get(msg.channel_id());
+				if (! c)
+					return;
+				QString pname = ChanACL::permName(static_cast<ChanACL::Permissions>(msg.permission()));
+				if (pDst == pSelf)
+					g.l->log(Log::PermissionDenied, tr("You were denied %1 privileges in %2.").arg(Log::msgColor(pname, Log::Privilege)).arg(Log::formatChannel(c)));
+				else
+					g.l->log(Log::PermissionDenied, tr("%3 was denied %1 privileges in %2.").arg(Log::msgColor(pname, Log::Privilege)).arg(Log::formatChannel(c)).arg(Log::formatClientUser(pDst, Log::Target)));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_SuperUser: {
+				g.l->log(Log::PermissionDenied, tr("Denied: Cannot modify SuperUser."));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_ChannelName: {
+				g.l->log(Log::PermissionDenied, tr("Denied: Invalid channel name."));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_TextTooLong: {
+				g.l->log(Log::PermissionDenied, tr("Denied: Text message too long."));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_H9K: {
+				if (g.bHappyEaster) {
+					unsigned short p;
+					QString h, u, pw;
+					bool bold = g.s.bDeaf;
+					bool bold2 = g.s.bTTS;
+					g.sh->getConnectionInfo(h, p, u, pw);
+					g.s.bDeaf = false;
+					g.s.bTTS = true;
+					quint32 oflags = g.s.qmMessages.value(Log::PermissionDenied);
+					g.s.qmMessages[Log::PermissionDenied] = (oflags | Settings::LogTTS) & (~Settings::LogSoundfile);
+					g.l->log(Log::PermissionDenied, QString::fromAscii(g.ccHappyEaster + 39).arg(u));
+					g.s.qmMessages[Log::PermissionDenied] = oflags;
+					g.s.bDeaf = bold;
+					g.s.bTTS = bold2;
+					g.mw->setWindowIcon(QIcon(QLatin1String(g.ccHappyEaster)));
+					g.mw->setStyleSheet(QString::fromAscii(g.ccHappyEaster + 82));
+					qWarning() << "Happy Easter";
+				}
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_TemporaryChannel: {
+				g.l->log(Log::PermissionDenied, tr("Denied: Operation not permitted in temporary channel."));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_MissingCertificate: {
+				VICTIM_INIT;
+				SELF_INIT;
+				if (pDst == pSelf)
+					g.l->log(Log::PermissionDenied, tr("You need a certificate to perform this operation."));
+				else
+					g.l->log(Log::PermissionDenied, tr("%1 does not have a certificate.").arg(Log::formatClientUser(pDst, Log::Target)));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_UserName: {
+				if (msg.has_name())
+					g.l->log(Log::PermissionDenied, tr("Invalid username: %1.").arg(u8(msg.name())));
+				else
+					g.l->log(Log::PermissionDenied, tr("Invalid username."));
+			}
+			break;
+		case MumbleProto::PermissionDenied_DenyType_ChannelFull: {
+				g.l->log(Log::PermissionDenied, tr("Channel is full."));
+			}
+			break;
+		default: {
+				if (msg.has_reason())
+					g.l->log(Log::PermissionDenied, tr("Denied: %1.").arg(u8(msg.reason())));
+				else
+					g.l->log(Log::PermissionDenied, tr("Permission denied."));
+			}
+			break;
+	}
 }
 
 void MessageHandler::msgUDPTunnel(const MumbleProto::UDPTunnel &) {