vc6 compilation updates

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@444 4f64403b-2f21-0410-a795-97e2b3489a10

3 files changed, 31 insertions, 34 deletions

diff --git a/metacontacts/MetaContacts.dsp b/metacontacts/MetaContacts.dsp
index fb7fbde..af10a0f 100644
--- a/metacontacts/MetaContacts.dsp
+++ b/metacontacts/MetaContacts.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METACONTACTS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METACONTACTS_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "METACONTACTS_EXPORTS" /D "_WINDLL" /D "_AFXDLL" /FR /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0xc09 /d "NDEBUG"

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 user32.lib gdi32.lib /nologo /base:"0x22010000" /dll /machine:I386 /out:"../../bin/release/plugins/MetaContacts.dll"

+# ADD LINK32 user32.lib gdi32.lib comctl32.lib /nologo /base:"0x22010000" /dll /machine:I386 /out:"../../bin/release/plugins/MetaContacts.dll"

 

 !ELSEIF  "$(CFG)" == "MetaContacts - Win32 Debug"

 

@@ -100,6 +100,10 @@ SOURCE=.\edit.c
 # End Source File

 # Begin Source File

 

+SOURCE=.\icons.c

+# End Source File

+# Begin Source File

+

 SOURCE=.\meta_api.c

 # End Source File

 # Begin Source File

diff --git a/metacontacts/meta_options.c b/metacontacts/meta_options.c
index 0540bd0..6fd6aa4 100644
--- a/metacontacts/meta_options.c
+++ b/metacontacts/meta_options.c
@@ -393,7 +393,7 @@ void WritePriorities() {
 	for(i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

 		mir_snprintf(szSetting, 256, "DefaultPrio_%d", i);

 		if(current->prio[i - ID_STATUS_OFFLINE] != GetDefaultPrio(i))

-			DBWriteContactSettingWord(0, META_PROTO, szSetting, current->prio[i - ID_STATUS_OFFLINE]);

+			DBWriteContactSettingWord(0, META_PROTO, szSetting, (WORD)current->prio[i - ID_STATUS_OFFLINE]);

 		else

 			DBDeleteContactSetting(0, META_PROTO, szSetting);

 	}

@@ -402,7 +402,7 @@ void WritePriorities() {
 		for(j = ID_STATUS_OFFLINE; j <= ID_STATUS_OUTTOLUNCH; j++) {

 			mir_snprintf(szSetting, 256, "ProtoPrio_%s%d", pppDesc[i]->szName, j);

 			if(!current->def[j - ID_STATUS_OFFLINE])

-				DBWriteContactSettingWord(0, META_PROTO, szSetting, current->prio[j - ID_STATUS_OFFLINE]);

+				DBWriteContactSettingWord(0, META_PROTO, szSetting, (WORD)current->prio[j - ID_STATUS_OFFLINE]);

 			else

 				DBDeleteContactSetting(0, META_PROTO, szSetting);

 		}

diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h
index 4f0ab1d..c9bb77a 100644
--- a/metacontacts/metacontacts.h
+++ b/metacontacts/metacontacts.h
@@ -33,42 +33,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_stdhdr.h>

 

 #include <windows.h>

-#include <winsock.h>

-#include <winbase.h>

 #include <commctrl.h>

-#include <stdio.h>

-#include <time.h>

-#include <stddef.h>

-#include <process.h>

 #include <string.h>

 #include <time.h>

-#include <malloc.h>

 #include "resource.h"

 

 #include "m_metacontacts.h"

-#include "m_icolib.h"

-

-#include "newpluginapi.h"

-#include "m_clist.h"

-#include "m_clui.h"

-#include "m_skin.h"

-#include "m_langpack.h"

-#include "m_protomod.h"

-#include "m_database.h"

-#include "m_system.h"

-#include "m_protocols.h"

-#include "m_userinfo.h"

-#include "m_options.h"

-#include "m_protosvc.h"

-#include "m_utils.h"

-#include "m_ignore.h"

-#include "m_clc.h"

-#include "m_contacts.h"

-#include "m_message.h"

-#include "m_ignore.h"

-#include "m_langpack.h"

-#include "m_popup.h"

-#include "m_cluiframes.h"

+

+#include <newpluginapi.h>

+#include <m_clist.h>

+#include <m_clui.h>

+#include <m_skin.h>

+#include <m_langpack.h>

+#include <m_protomod.h>

+#include <m_database.h>

+#include <m_system.h>

+#include <m_protocols.h>

+#include <m_userinfo.h>

+#include <m_options.h>

+#include <m_protosvc.h>

+#include <m_utils.h>

+#include <m_ignore.h>

+#include <m_clc.h>

+#include <m_contacts.h>

+#include <m_message.h>

+#include <m_ignore.h>

+#include <m_icolib.h>

+#include <m_langpack.h>

+#include <m_popup.h>

+#include <m_cluiframes.h>

 #include "../updater/m_updater.h"

 

 #define META_PROTO				"MetaContacts"