From 11bf59bd44067bd417432e29c71119f56d11fa27 Mon Sep 17 00:00:00 2001
From: Robert Förster
Date: Wed, 2 Dec 2009 06:57:42 +0000
Subject: the late night / early morning commit: unbreak win32 compile
 (drycoded)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3647 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/dcc/broker.cpp   | 12 +++++++++++-
 src/modules/dcc/requests.cpp |  8 +++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index fe2877474..e72773727 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -29,7 +29,10 @@
 #include "chat.h"
 #include "send.h"
 #include "voice.h"
-#include "video.h"
+
+#ifndef COMPILE_DISABLE_DCC_VIDEO
+	#include "video.h"
+#endif
 
 #ifdef COMPILE_DCC_CANVAS
 	#include "canvas.h"
@@ -404,6 +407,7 @@ void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
 // ACTIVE VIDEO
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef COMPILE_DISABLE_DCC_VIDEO
 void KviDccBroker::activeVideoManage(KviDccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
@@ -450,6 +454,10 @@ void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	if(bMinimized)v->minimize();
 
 	m_pDccWindowList->append(v);
+#else
+void KviDccBroker::activeVideoExecute(KviDccBox *,KviDccDescriptor *)
+{
+#endif
 }
 
 
@@ -457,6 +465,7 @@ void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
 // PASSIVE VIDEO
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifndef COMPILE_DISABLE_DCC_VIDEO
 void KviDccBroker::passiveVideoExecute(KviDccDescriptor * dcc)
 {
 	KviStr tmp(KviStr::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
@@ -467,6 +476,7 @@ void KviDccBroker::passiveVideoExecute(KviDccDescriptor * dcc)
 	if(bMinimized)v->minimize();
 	m_pDccWindowList->append(v);
 }
+#endif
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 3b27014c5..c34314d4e 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -26,7 +26,11 @@
 
 #include "gsmcodec.h"
 #include "broker.h"
-#include "video.h"
+
+#ifndef COMPILE_DISABLE_DCC_VIDEO
+	#include "video.h"
+#endif
+
 #include "voice.h"
 #include "utils.h"
 #include "send.h"
@@ -1068,6 +1072,7 @@ static void dccModuleParseDccVideo(KviDccRequest *dcc)
 		return;
 	}
 #endif
+#ifndef COMPILE_DISABLE_DCC_VIDEO
 	//  Actually unused parameter
 	if(!kvi_dcc_video_is_valid_codec(dcc->szParam1.ptr()))
 	{
@@ -1112,6 +1117,7 @@ static void dccModuleParseDccVideo(KviDccRequest *dcc)
 	dcc_module_set_dcc_type(d,"VIDEO");
 	d->triggerCreationEvent();
 	g_pDccBroker->activeVideoManage(d);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.3.1-10-gc9f91