hmm.

7 files changed, 17 insertions, 16 deletions

diff --git a/commonheaders.h b/commonheaders.h
index c52ca17..69eab89 100644
--- a/commonheaders.h
+++ b/commonheaders.h
@@ -23,7 +23,7 @@
 
 #define MIRANDA_VER 0x0800
 #include <newpluginapi.h>
-//#include <m_netlib.h>
+#include <m_jabber.h>
 #include <m_database.h>
 #include <m_options.h>
 #include <m_langpack.h>
diff --git a/init.c b/init.cpp
index 044856c..8b380d7 100644
--- a/init.c
+++ b/init.cpp
@@ -26,6 +26,9 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);
 extern char *date();
 extern int WaMpdOptInit(WPARAM wParam,LPARAM lParam);
 
+struct MM_INTERFACE mmi;
+struct UTF8_INTERFACE  utfi;
+
 
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
@@ -47,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
 	return TRUE;
 }
 
-__declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
 {
 	{
 	  static char plugname[52];
@@ -62,12 +65,12 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
 }
 
 static const MUUID interfaces[] = {MIID_SERVICEMODE, MIID_LAST};
-__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 {
 	return interfaces;
 }
 
-int __declspec(dllexport) Load(PLUGINLINK *link)
+extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 {
 	pluginLink=link;
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/juick.vcproj b/juick.vcproj
index 16cd78c..041fbb8 100644
--- a/juick.vcproj
+++ b/juick.vcproj
@@ -54,7 +54,7 @@
 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FULL_BUILD"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE"

 				StringPooling="true"

 				RuntimeLibrary="2"

 				EnableFunctionLevelLinking="true"

@@ -150,7 +150,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;FULL_BUILD"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -246,7 +246,7 @@
 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;FULL_BUILD"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -608,19 +608,19 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 			>

 			<File

-				RelativePath=".\init.c"

+				RelativePath=".\init.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\main.c"

+				RelativePath=".\main.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\options.c"

+				RelativePath=".\options.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\utilities.c"

+				RelativePath=".\utilities.cpp"

 				>

 			</File>

 		</Filter>

diff --git a/main.c b/main.cpp
index 3f8d5b0..3f8d5b0 100644
--- a/main.c
+++ b/main.cpp
diff --git a/main.h b/main.h
index f61c90c..4888068 100644
--- a/main.h
+++ b/main.h
@@ -16,9 +16,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-struct MM_INTERFACE mmi;
-struct UTF8_INTERFACE  utfi;
-
 #endif
 
 
diff --git a/options.c b/options.cpp
index 782c346..360cfe0 100644
--- a/options.c
+++ b/options.cpp
@@ -17,7 +17,7 @@
 #include "commonheaders.h"
 #include <uxtheme.h>
 
-HINSTANCE hInst;
+extern HINSTANCE hInst;
 
 static BOOL CALLBACK DlgProcJuickOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
@@ -51,7 +51,8 @@ static BOOL CALLBACK DlgProcJuickOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
     {
       switch (LOWORD(wParam))
       {
-
+	  default:
+		break;
       }
       
       SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
diff --git a/utilities.c b/utilities.cpp
index 170dcca..170dcca 100644
--- a/utilities.c
+++ b/utilities.cpp