- 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

1 files changed, 2 insertions, 2 deletions

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());