- Happy new year!

 - Some parts of kvirc still refered to KviMainWindow as frame(), m_pFrm, etc.. => fixed
 - Some parts of kvirc were still coded as if more than one KviMainWindows could exists => fixed, this involved changing KviWindows's ctor and removing KviWindow::frame(), thus the big change
 - The trayicon module still called itself (and was called) dockextension, and was built to support more than one KviMainWindows => renamed and fixed
 - Modified KviWindow::hasAttention so that is can be used everywhere instead of mixing different ways to check if a notificationm should popup
 - should fix #1221 and hopefully introduce little to no bugs



git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6010 17fca916-40b9-46aa-a4ea-0a15b648b75c

12 files changed, 45 insertions, 46 deletions

diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 8151d730a..2fa874758 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -323,13 +323,13 @@ void DccBroker::executeChat(DccDialog *box,DccDescriptor * dcc)
 	szSubProto.toLower();
 
 	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr(), dcc->szNick, dcc->szIp, dcc->szPort);
-	DccChatWindow * chat = new DccChatWindow(dcc->console()->frame(),dcc,tmp.toUtf8().data());
+	DccChatWindow * chat = new DccChatWindow(dcc,tmp.toUtf8().data());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat) || \
 				(dcc->bAutoAccept && KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChatWhenAutoAccepted)));
 
-	dcc->console()->frame()->addWindow(chat,!bMinimized);
+	g_pMainWindow->addWindow(chat,!bMinimized);
 	if(bMinimized)chat->minimize();
 	m_pDccWindowList->append(chat);
 }
@@ -374,13 +374,13 @@ void DccBroker::activeVoiceExecute(DccDialog *box,DccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccVoiceWindow * v = new DccVoiceWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVoiceWindow * v = new DccVoiceWindow(dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice) || \
 				(dcc->bAutoAccept && KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted)));
 
-	dcc->console()->frame()->addWindow(v,!bMinimized);
+	g_pMainWindow->addWindow(v,!bMinimized);
 	if(bMinimized)v->minimize();
 
 	m_pDccWindowList->append(v);
@@ -394,10 +394,10 @@ void DccBroker::activeVoiceExecute(DccDialog *box,DccDescriptor * dcc)
 void DccBroker::passiveVoiceExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccVoiceWindow * v = new DccVoiceWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVoiceWindow * v = new DccVoiceWindow(dcc,tmp.ptr());
 	//#warning "Create minimized dcc voice ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
-	dcc->console()->frame()->addWindow(v,!bMinimized);
+	g_pMainWindow->addWindow(v,!bMinimized);
 	if(bMinimized)v->minimize();
 	m_pDccWindowList->append(v);
 }
@@ -444,13 +444,13 @@ void DccBroker::activeVideoExecute(DccDialog *box,DccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccVideoWindow * v = new DccVideoWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVideoWindow * v = new DccVideoWindow(dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVideo) || \
 				(dcc->bAutoAccept && KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVideoWhenAutoAccepted)));
 
-	dcc->console()->frame()->addWindow(v,!bMinimized);
+	g_pMainWindow->addWindow(v,!bMinimized);
 	if(bMinimized)v->minimize();
 
 	m_pDccWindowList->append(v);
@@ -469,10 +469,10 @@ void DccBroker::activeVideoExecute(DccDialog *,DccDescriptor *)
 void DccBroker::passiveVideoExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccVideoWindow * v = new DccVideoWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVideoWindow * v = new DccVideoWindow(dcc,tmp.ptr());
 	//#warning "Create minimized dcc video ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
-	dcc->console()->frame()->addWindow(v,!bMinimized);
+	g_pMainWindow->addWindow(v,!bMinimized);
 	if(bMinimized)v->minimize();
 	m_pDccWindowList->append(v);
 #else
@@ -525,14 +525,14 @@ void DccBroker::activeCanvasExecute(DccDialog *box,DccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccCanvasWindow * cnv = new DccCanvasWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccCanvasWindow * cnv = new DccCanvasWindow(dcc,tmp.ptr());
 
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat) || \
 				(dcc->bAutoAccept && KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChatWhenAutoAccepted)));
 
-	dcc->console()->frame()->addWindow(cnv,!bMinimized);
+	g_pMainWindow->addWindow(cnv,!bMinimized);
 	if(bMinimized)cnv->minimize();
 
 	m_pDccWindowList->append(cnv);
@@ -549,10 +549,10 @@ void DccBroker::activeCanvasExecute(DccDialog *,DccDescriptor *)
 void DccBroker::passiveCanvasExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	DccCanvasWindow * cnv = new DccCanvasWindow(dcc->console()->frame(),dcc,tmp.ptr());
+	DccCanvasWindow * cnv = new DccCanvasWindow(dcc,tmp.ptr());
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
-	dcc->console()->frame()->addWindow(cnv,!bMinimized);
+	g_pMainWindow->addWindow(cnv,!bMinimized);
 	if(bMinimized)cnv->minimize();
 	m_pDccWindowList->append(cnv);
 }
@@ -865,7 +865,6 @@ void DccBroker::recvFileExecute(DccDialog *box,DccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	//KviDccSend * send = new KviDccSend(dcc->console()->frame(),dcc,tmp.ptr());
 	DccFileTransfer * send = new DccFileTransfer(dcc);
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index 73f442b2c..969419528 100644
--- a/src/modules/dcc/DccCanvasWindow.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -56,14 +56,14 @@
 	extern DccBroker * g_pDccBroker;
 
 
-	DccCanvasWindow::DccCanvasWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-	: DccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc)
+	DccCanvasWindow::DccCanvasWindow(DccDescriptor * dcc,const char * name)
+	: DccWindow(KVI_WINDOW_TYPE_DCCCANVAS,name,dcc)
 	{
 		m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter");
 
 		m_pCanvas   = new DccCanvasWidget(m_pSplitter);
 
-		m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
+		m_pIrcView  = new KviIrcView(m_pSplitter,this);
 		m_pInput    = new KviInput(this);
 
 	//	setFocusHandler(m_pInput,this);
diff --git a/src/modules/dcc/DccCanvasWindow.h b/src/modules/dcc/DccCanvasWindow.h
index c931759b6..0208e30a2 100644
--- a/src/modules/dcc/DccCanvasWindow.h
+++ b/src/modules/dcc/DccCanvasWindow.h
@@ -43,7 +43,7 @@
 	{
 		Q_OBJECT
 	public:
-		DccCanvasWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+		DccCanvasWindow(DccDescriptor * dcc,const char * name);
 		~DccCanvasWindow();
 	protected:
 	//	KviDccCanvasThread     * m_pSlaveThread;
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index d3bfddfa1..ff942d7bc 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -81,8 +81,8 @@ extern DccBroker * g_pDccBroker;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-DccChatWindow::DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KviWindow::DccChat,pFrm,name,dcc)
+DccChatWindow::DccChatWindow(DccDescriptor * dcc,const char * name)
+: DccWindow(KviWindow::DccChat,name,dcc)
 {
 	m_pButtonBox = new KviTalHBox(this);
 
@@ -101,7 +101,7 @@ DccChatWindow::DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char
 	m_pSplitter->setObjectName("dcc_chat_splitter");
 	m_pSplitter->setChildrenCollapsible(false);
 
-	m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
+	m_pIrcView  = new KviIrcView(m_pSplitter,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	m_pInput    = new KviInput(this);
 
@@ -319,7 +319,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 						KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
 						m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 						if(bUserFeedback)
-							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+							g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
 								m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 					}
@@ -331,7 +331,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 						if(bUserFeedback)
 						{
 							QString encr = decodeText(encrypted.ptr());
-							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+							g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
 								m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsoleWindow::NoNotifications);
 						}
@@ -354,7 +354,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 				m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 				
 				if(bUserFeedback)
-					m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+					g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 						m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
 						m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsoleWindow::NoNotifications);
 				return;
@@ -366,7 +366,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 	
 	if(bUserFeedback)
-		m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+		g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 			m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
 			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 }
@@ -431,7 +431,7 @@ bool DccChatWindow::event(QEvent *e)
 					if(kvi_strEqualCIN("ACTION",d.ptr(),6))d.cutLeft(6);
 					d.stripLeftWhiteSpace();
 					output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szNick),d.ptr());
-					if(!hasAttention())
+					if(!hasAttention(KviWindow::MainWindowIsVisible))
 					{
 						if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
 						{
@@ -462,7 +462,7 @@ bool DccChatWindow::event(QEvent *e)
 								case KviCryptEngine::DecryptOkWasPlainText:
 									if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(decryptedStuff.ptr()),m_pDescriptor->idString()))
 									{
-										m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
+										g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
 											m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
 											m_pDescriptor->szHost.toUtf8().data(),decryptedStuff.ptr());
 									}
@@ -485,10 +485,10 @@ bool DccChatWindow::event(QEvent *e)
 						// FIXME!
 						if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(d.ptr()),m_pDescriptor->idString()))
 						{
-							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
+							g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
 								m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
 								m_pDescriptor->szHost.toUtf8().data(),d.ptr());
-							if(!hasAttention())
+							if(!hasAttention(KviWindow::MainWindowIsVisible))
 							{
 								if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
 								{
diff --git a/src/modules/dcc/DccChatWindow.h b/src/modules/dcc/DccChatWindow.h
index 7a2eb1531..1bc80c202 100644
--- a/src/modules/dcc/DccChatWindow.h
+++ b/src/modules/dcc/DccChatWindow.h
@@ -69,7 +69,7 @@ class DccChatWindow : public DccWindow
 {
 	Q_OBJECT
 public:
-	DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	DccChatWindow(DccDescriptor * dcc,const char * name);
 	~DccChatWindow();
 	QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; };
 protected:
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 166043a16..e2d5055a9 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -422,8 +422,8 @@ exit_dcc:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KviWindow::DccVideo,pFrm,name,dcc)
+DccVideoWindow::DccVideoWindow(DccDescriptor * dcc,const char * name)
+: DccWindow(KviWindow::DccVideo,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
@@ -450,7 +450,7 @@ DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha
 	m_pLayout = new QGridLayout(m_pContainerWidget);
 	m_pContainerWidget->setLayout(m_pLayout);
 
-	m_pIrcView  = new KviIrcView(this,pFrm,this);
+	m_pIrcView  = new KviIrcView(this,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	m_pInput    = new KviInput(this);
 
@@ -822,7 +822,7 @@ bool DccVideoWindow::event(QEvent *e)
 						d.cutLeft(6);
 					d.stripLeftWhiteSpace();
 					output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szNick),d.ptr());
-					if(!hasAttention())
+					if(!hasAttention(KviWindow::MainWindowIsVisible))
 					{
 						if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
 						{
@@ -879,7 +879,7 @@ bool DccVideoWindow::event(QEvent *e)
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
 								m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
 								m_pDescriptor->szHost.toUtf8().data(),d.ptr());
-							if(!hasAttention())
+							if(!hasAttention(KviWindow::MainWindowIsVisible))
 							{
 								if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
 								{
diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
index edd6fd02a..d1ffa0c8d 100644
--- a/src/modules/dcc/DccVideoWindow.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -109,7 +109,7 @@ class DccVideoWindow : public DccWindow
 	Q_OBJECT
 	friend class DccVideoThread;
 public:
-	DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	DccVideoWindow(DccDescriptor * dcc,const char * name);
 	~DccVideoWindow();
 protected:
 	KviThemedLabel         * m_pLabel;
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index 24ddcbd73..1dd451e4a 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -637,15 +637,15 @@ exit_dcc:
 }
 
 
-DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KviWindow::DccVoice,pFrm,name,dcc)
+DccVoiceWindow::DccVoiceWindow(DccDescriptor * dcc,const char * name)
+: DccWindow(KviWindow::DccVoice,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("dcc_window_splitter");
-	m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
+	m_pIrcView = new KviIrcView(m_pSplitter,this);
 
 	m_pHBox = new KviTalHBox(this);
 
diff --git a/src/modules/dcc/DccVoiceWindow.h b/src/modules/dcc/DccVoiceWindow.h
index 73af363c0..01eb68bbe 100644
--- a/src/modules/dcc/DccVoiceWindow.h
+++ b/src/modules/dcc/DccVoiceWindow.h
@@ -107,7 +107,7 @@ class DccVoiceWindow : public DccWindow
 {
 	Q_OBJECT
 public:
-	DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	DccVoiceWindow(DccDescriptor * dcc,const char * name);
 	~DccVoiceWindow();
 protected:
 	KviTalHBox                  * m_pHBox;
diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp
index 4989fa5c2..d18dad460 100644
--- a/src/modules/dcc/DccWindow.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -26,8 +26,8 @@
 
 #include "KviTalHBox.h"
 
-DccWindow::DccWindow(KviWindow::Type eType,KviMainWindow * lpFrm,const char * name,DccDescriptor * d)
-: KviWindow(eType,lpFrm,name, d->console())
+DccWindow::DccWindow(KviWindow::Type eType,const char * name,DccDescriptor * d)
+: KviWindow(eType,name, d->console())
 {
 	m_pDescriptor = d;
 	m_pDescriptor->setWindow(this);
diff --git a/src/modules/dcc/DccWindow.h b/src/modules/dcc/DccWindow.h
index 40c479cbf..69b5948d0 100644
--- a/src/modules/dcc/DccWindow.h
+++ b/src/modules/dcc/DccWindow.h
@@ -35,7 +35,7 @@ class DccWindow : public KviWindow, public DccMarshalOutputContext
 {
 	Q_OBJECT
 public:
-	DccWindow(KviWindow::Type eType,KviMainWindow * lpFrm,const char * name,DccDescriptor * d);
+	DccWindow(KviWindow::Type eType,const char * name,DccDescriptor * d);
 	~DccWindow();
 protected:
 	DccDescriptor       * m_pDescriptor;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index c8df8bfda..801942199 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -90,7 +90,7 @@ static bool dcc_kvs_parse_default_parameters(DccDescriptor * d,KviKvsModuleComma
 			delete d;
 			c->error(__tr2qs_ctx("This window has no associated IRC context (an IRC context is required unless -c or -n are passed)","dcc"));
 			return false;
-		} else d->setConsole(c->window()->frame()->firstConsole());
+		} else d->setConsole(g_pMainWindow->firstConsole());
 	}
 
 	KVI_ASSERT(d->console());
@@ -1280,7 +1280,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 	{
 		// We don't need a console with -c and -n, otherwise we need it
 		if(!(c->hasSwitch('c') || c->hasSwitch('n')))return c->noIrcContext();
-		else d->console() = c->window()->frame()->firstConsole();
+		else d->console() = g_pMainWindow->firstConsole();
 	}
 
 	KVI_ASSERT(d->console());