Import win32 branch

32 files changed, 3382 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 80fbbf0b..15243459 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,15 @@
 -include Makefile.settings
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o debug.o
+objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o nick.o query.o set.o url.o user.o debug.o log.o
 subdirs = protocols
 
+ifeq ($(ARCH),Windows)
+objects += win32.o
+else
+objects += unix.o conf.o
+endif
+
 # Expansion of variables
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 CFLAGS += -Wall
diff --git a/win32.c b/win32.c
new file mode 100644
index 00000000..5234c046
--- /dev/null
+++ b/win32.c
@@ -0,0 +1,191 @@
+  /********************************************************************\
+  * BitlBee -- An IRC to other IM-networks gateway                     *
+  *                                                                    *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  \********************************************************************/
+
+/* Main file (Unix specific part)                                       */
+
+/*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "bitlbee.h"
+#include "commands.h"
+#include "crypting.h"
+#include "protocols/nogaim.h"
+#include "help.h"
+#include <signal.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <winreg.h>
+#include <winbase.h>
+
+global_t global;	/* Against global namespace pollution */
+
+int main( int argc, char *argv[] )
+{
+	int i = -1;
+	memset( &global, 0, sizeof( global_t ) );
+	
+	global.loop = g_main_new( FALSE );
+	
+	log_init( );
+	nogaim_init( );
+	
+	global.conf = conf_load( argc, argv );
+	if( global.conf == NULL )
+		return( 1 );
+	
+	if( global.conf->runmode == RUNMODE_INETD )
+	{
+		i = bitlbee_inetd_init();
+		log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
+
+	}
+	else if( global.conf->runmode == RUNMODE_DAEMON )
+	{
+		i = bitlbee_daemon_init();
+		log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
+	} 
+	else 
+	{
+		log_message( LOGLVL_INFO, "No bitlbee mode specified...");
+	}
+	
+	if( i != 0 )
+		return( i );
+ 	
+	if( access( global.conf->configdir, F_OK ) != 0 )
+		log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir );
+	else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
+		log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
+	if( help_init( &(global.help) ) == NULL )
+		log_message( LOGLVL_WARNING, "Error opening helpfile %s.", global.helpfile );
+	
+	g_main_run( global.loop );
+	
+	return( 0 );
+}
+
+double gettime()
+{
+	return (GetTickCount() / 1000);
+}
+
+void conf_get_string(HKEY section, const char *name, const char *def, char **dest)
+{
+	char buf[4096];
+	long x;
+	if (RegQueryValue(section, name, buf, &x) == ERROR_SUCCESS) {
+		*dest = g_strdup(buf);
+	} else if (!def) {
+		*dest = NULL;
+	} else {
+		*dest = g_strdup(def);
+	}
+}
+
+
+void conf_get_int(HKEY section, const char *name, int def, int *dest)
+{
+	char buf[20];
+	long x;
+	DWORD y;
+	if (RegQueryValue(section, name, buf, &x) == ERROR_SUCCESS) {
+		memcpy(&y, buf, sizeof(DWORD));
+		*dest = y;
+	} else {
+		*dest = def;
+	}
+}
+
+conf_t *conf_load( int argc, char *argv[] ) 
+{
+	conf_t *conf;
+	HKEY key, key_main, key_proxy;
+	char *tmp;
+	RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee", &key);
+	RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee\\main", &key_main);
+	RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee\\proxy", &key_proxy);
+	
+	memset( &global, 0, sizeof( global_t ) );
+	global.loop = g_main_new(FALSE);
+	nogaim_init();
+
+	conf = g_new0( conf_t,1 );
+	global.conf = conf;
+	conf_get_string(key_main, "interface", "0.0.0.0", &global.conf->iface);
+	conf_get_int(key_main, "port", 6667, &global.conf->port);
+	conf_get_int(key_main, "verbose", 0, &global.conf->verbose);
+	conf_get_string(key_main, "password", "", &global.conf->password);
+	conf_get_int(key_main, "ping_interval_timeout", 60, &global.conf->ping_interval);
+	conf_get_string(key_main, "hostname", "localhost", &global.conf->hostname);
+	conf_get_string(key_main, "configdir", NULL, &global.conf->configdir);
+	conf_get_string(key_main, "motdfile", NULL, &global.conf->motdfile);
+	conf_get_string(key_main, "helpfile", NULL, &global.helpfile);
+	global.conf->runmode = RUNMODE_INETD;
+	conf_get_int(key_main, "AuthMode", AUTHMODE_CLOSED, &global.conf->authmode);
+	conf_get_string(key_proxy, "host", "", &tmp); strcpy(proxyhost, tmp);
+	conf_get_string(key_proxy, "user", "", &tmp); strcpy(proxyuser, tmp);
+	conf_get_string(key_proxy, "password", "", &tmp); strcpy(proxypass, tmp);
+	conf_get_int(key_proxy, "type", PROXY_NONE, &proxytype);
+	conf_get_int(key_proxy, "port", 3128, &proxyport);
+
+	RegCloseKey(key);
+	RegCloseKey(key_main);
+	RegCloseKey(key_proxy);
+
+	return conf;
+}
+
+void conf_loaddefaults( irc_t *irc )
+{
+	HKEY key_defaults;
+	int i;
+	char name[4096], data[4096];
+	DWORD namelen = sizeof(name), datalen = sizeof(data);
+	DWORD type;
+	if (RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee\\defaults", &key_defaults) != ERROR_SUCCESS) {
+		return;
+	}
+
+	for (i = 0; RegEnumValue(key_defaults, i, name, &namelen, NULL, &type, data, &datalen) == ERROR_SUCCESS; i++) {
+		set_t *s = set_find( irc, name );
+			
+		if( s )
+		{
+			if( s->def ) g_free( s->def );
+			s->def = g_strdup( data );
+		}
+
+		namelen = sizeof(name);
+		datalen = sizeof(data);
+	}
+
+	RegCloseKey(key_defaults);
+}
+
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
+int
+inet_aton(const char *cp, struct in_addr *addr)
+{
+  addr->s_addr = inet_addr(cp);
+  return (addr->s_addr == INADDR_NONE) ? 0 : 1;
+}
diff --git a/win32/BUILD.TXT b/win32/BUILD.TXT
new file mode 100644
index 00000000..718152b7
--- /dev/null
+++ b/win32/BUILD.TXT
@@ -0,0 +1,22 @@
+Instructions for building the Bitlbee Win32 port

+================================================

+

+1. Download the latest version using bzr (http://www.bazaar-ng.org/):

+   bzr branch http://jelmer.vernstok.nl/oss/bitlbee/bzr/win32 bitlbee-win32

+2. Download and install the required development files: 

+    from http://www.ethereal.com/distribution/win32/development/:

+    - libiconv

+    - glib

+    - glib-dev

+    from http://ftp.mozilla.org/pub/mozilla.org/

+    - nss

+    - nspr

+

+I've put them inside c:\dev, so you might have the most with that location.

+

+3. Open bitlbee.dsw in VC++ and build :-)

+

+4. Now you're done. When running, make sure all the required DLL's are accessible. If they can't be found, place them inside c:\winnt\system32 or the Debug or Release directories inside bitlbee-...\win32\.

+

+5. To build setup files, compile the bitlbee.iss file using the Inno Setup 

+   program (available from www.jrsoftware.org).

diff --git a/win32/MainDlg.cpp b/win32/MainDlg.cpp
new file mode 100644
index 00000000..615a9a3b
--- /dev/null
+++ b/win32/MainDlg.cpp
@@ -0,0 +1,78 @@
+// MainDlg.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "PropUsers.h"
+#include "PropPaths.h"
+#include "PropAccess.h"
+#include "PropLog.h"

+#include "PropConn.h"
+#include "MainDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainDlg
+
+IMPLEMENT_DYNAMIC(CMainDlg, CPropertySheet)
+
+CMainDlg::CMainDlg() : CPropertySheet("Bitlbee for Windows") 
+{
+	AddPage(new CPropPaths());
+	AddPage(new CPropAccess());
+	AddPage(new CPropUsers());
+	AddPage(new CPropLog());
+	AddPage(new CPropertyPage(IDD_PROPPAGE_ABOUT));

+	AddPage(new CPropConn());
+	Create();
+	ShowWindow(SW_HIDE);
+}
+
+CMainDlg::~CMainDlg()
+{
+}
+
+
+BEGIN_MESSAGE_MAP(CMainDlg, CPropertySheet)
+	//{{AFX_MSG_MAP(CMainDlg)
+	ON_WM_CLOSE()
+	//}}AFX_MSG_MAP
+	ON_BN_CLICKED(IDOK, OnOK)
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainDlg message handlers
+
+BOOL CMainDlg::OnInitDialog() 
+{
+	m_bModeless = FALSE;
+	m_nFlags |= WF_CONTINUEMODAL;
+	
+	CPropertySheet::OnInitDialog();
+	GetDlgItem(IDHELP)->ShowWindow(SW_HIDE);
+	GetDlgItem(IDCANCEL)->ShowWindow(SW_HIDE);
+
+	m_bModeless = TRUE;
+	m_nFlags &= WF_CONTINUEMODAL;
+	
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void CMainDlg::OnOK()
+{
+	PressButton(PSBTN_APPLYNOW);
+	ShowWindow(SW_HIDE);
+}
+
+
+void CMainDlg::OnClose() 
+{
+	ShowWindow(SW_HIDE);
+}
+

diff --git a/win32/MainDlg.h b/win32/MainDlg.h
new file mode 100644
index 00000000..7cdf612b
--- /dev/null
+++ b/win32/MainDlg.h
@@ -0,0 +1,52 @@
+#if !defined(AFX_MAINDLG_H__D88FFF4C_047D_4562_A041_CCDCFA52F87C__INCLUDED_)
+#define AFX_MAINDLG_H__D88FFF4C_047D_4562_A041_CCDCFA52F87C__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// MainDlg.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainDlg
+
+class CMainDlg : public CPropertySheet
+{
+	DECLARE_DYNAMIC(CMainDlg)
+
+// Construction
+public:
+	CMainDlg();
+
+// Attributes
+public:
+
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMainDlg)
+	//}}AFX_VIRTUAL
+
+// Implementation
+public:
+	virtual ~CMainDlg();
+
+	// Generated message map functions
+protected:
+	//{{AFX_MSG(CMainDlg)
+	virtual BOOL OnInitDialog();
+	afx_msg void OnClose();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+private:
+	void OnOK();
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_MAINDLG_H__D88FFF4C_047D_4562_A041_CCDCFA52F87C__INCLUDED_)
diff --git a/win32/PropAccess.cpp b/win32/PropAccess.cpp
new file mode 100644
index 00000000..fd787b39
--- /dev/null
+++ b/win32/PropAccess.cpp
@@ -0,0 +1,123 @@
+// PropAccess.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "PropAccess.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropAccess dialog
+
+
+CPropAccess::CPropAccess()
+	: CPropertyPage(CPropAccess::IDD)
+{
+
+	//{{AFX_DATA_INIT(CPropAccess)
+	//}}AFX_DATA_INIT
+}
+
+
+void CPropAccess::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CPropAccess)
+	DDX_Control(pDX, IDC_AUTH_REGISTERED, m_auth_registered);
+	DDX_Control(pDX, IDC_AUTH_OPEN, m_auth_open);
+	DDX_Control(pDX, IDC_AUTH_CLOSED, m_auth_closed);
+	DDX_Control(pDX, IDC_PASSWORD, m_password);
+	DDX_Control(pDX, IDC_PORT, m_port);
+	DDX_Control(pDX, IDC_INTERFACE, m_interface);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropAccess, CPropertyPage)
+	//{{AFX_MSG_MAP(CPropAccess)
+	ON_BN_CLICKED(IDC_AUTH_REGISTERED, OnAuthRegistered)
+	ON_BN_CLICKED(IDC_AUTH_OPEN, OnAuthOpen)
+	ON_BN_CLICKED(IDC_AUTH_CLOSED, OnAuthClosed)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropAccess message handlers
+
+void CPropAccess::OnOK() 
+{
+	CString iface; m_interface.GetWindowText(iface);
+	CString port; m_port.GetWindowText(port);
+
+	CString password; m_password.GetWindowText(password);
+	g_free((void *)global.conf->password);
+	global.conf->password = g_strdup(password);
+
+	if(m_auth_closed.GetCheck() == 1) global.conf->authmode = AUTHMODE_CLOSED;
+	if(m_auth_open.GetCheck() == 1) global.conf->authmode = AUTHMODE_OPEN;
+	if(m_auth_registered.GetCheck() == 1) global.conf->authmode = AUTHMODE_REGISTERED;
+
+	if(strcmp(iface, global.conf->iface) || atol(port) != global.conf->port) {
+		global.conf->port = atoi(port);
+		g_free((void *)global.conf->iface);
+		global.conf->iface = g_strdup(iface);
+		closesocket(global.listen_socket);
+		bitlbee_daemon_init();
+	}
+
+	
+	CPropertyPage::OnOK();
+}
+
+void CPropAccess::OnAuthRegistered() 
+{
+	m_password.EnableWindow(FALSE);
+	m_auth_open.SetCheck(0);
+	m_auth_registered.SetCheck(1);
+	m_auth_closed.SetCheck(0);
+	
+}
+
+void CPropAccess::OnAuthOpen() 
+{
+	m_password.EnableWindow(FALSE);
+	m_auth_open.SetCheck(1);
+	m_auth_registered.SetCheck(0);
+	m_auth_closed.SetCheck(0);
+}
+
+void CPropAccess::OnAuthClosed() 
+{
+	m_password.EnableWindow(TRUE);
+	m_auth_open.SetCheck(0);
+	m_auth_registered.SetCheck(0);
+	m_auth_closed.SetCheck(1);
+	
+}
+
+BOOL CPropAccess::OnInitDialog() 
+{
+	CPropertyPage::OnInitDialog();
+
+	m_interface.SetWindowText(global.conf->iface);
+	m_password.SetWindowText(global.conf->password);
+	char tmp[20];
+	g_snprintf(tmp, sizeof(tmp), "%d", global.conf->port);
+	m_port.SetWindowText(tmp);
+	m_auth_open.SetCheck(0);
+	m_auth_closed.SetCheck(0);
+	m_auth_registered.SetCheck(0);
+
+	switch(global.conf->authmode) {
+	case AUTHMODE_OPEN: m_auth_open.SetCheck(1); m_password.EnableWindow(FALSE);break;
+	case AUTHMODE_CLOSED: m_auth_closed.SetCheck(1); m_password.EnableWindow(TRUE);break;
+	case AUTHMODE_REGISTERED: m_auth_registered.SetCheck(1);m_password.EnableWindow(FALSE);break;
+	}
+	
+	return TRUE;
+}
diff --git a/win32/PropAccess.h b/win32/PropAccess.h
new file mode 100644
index 00000000..bc80c648
--- /dev/null
+++ b/win32/PropAccess.h
@@ -0,0 +1,56 @@
+#if !defined(AFX_PROPACCESS_H__0AC45777_B43C_4467_91FF_391DFD582057__INCLUDED_)
+#define AFX_PROPACCESS_H__0AC45777_B43C_4467_91FF_391DFD582057__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// PropAccess.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropAccess dialog
+
+class CPropAccess : public CPropertyPage
+{
+// Construction
+public:
+	CPropAccess();   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CPropAccess)
+	enum { IDD = IDD_PROPPAGE_ACCESS };
+	CButton	m_auth_registered;
+	CButton	m_auth_open;
+	CButton	m_auth_closed;
+	CEdit	m_password;
+	CEdit	m_port;
+	CEdit	m_interface;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CPropAccess)
+	public:
+	virtual void OnOK();
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CPropAccess)
+	afx_msg void OnAuthRegistered();
+	afx_msg void OnAuthOpen();
+	afx_msg void OnAuthClosed();
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPACCESS_H__0AC45777_B43C_4467_91FF_391DFD582057__INCLUDED_)
diff --git a/win32/PropConn.cpp b/win32/PropConn.cpp
new file mode 100644
index 00000000..15d4a90a
--- /dev/null
+++ b/win32/PropConn.cpp
@@ -0,0 +1,125 @@
+// PropConn.cpp : implementation file

+//

+

+#define BITLBEE_CORE

+#include "bitlbeewin.h"

+#include "PropConn.h"

+

+#ifdef _DEBUG

+#define new DEBUG_NEW

+#undef THIS_FILE

+static char THIS_FILE[] = __FILE__;

+#endif

+

+/////////////////////////////////////////////////////////////////////////////

+// CPropConn dialog

+

+

+CPropConn::CPropConn(CWnd* pParent /*=NULL*/)

+	: CPropertyPage(CPropConn::IDD)

+{

+	//{{AFX_DATA_INIT(CPropConn)

+	//}}AFX_DATA_INIT

+}

+

+

+void CPropConn::DoDataExchange(CDataExchange* pDX)

+{

+	CDialog::DoDataExchange(pDX);

+	//{{AFX_DATA_MAP(CPropConn)

+	DDX_Control(pDX, IDC_PROXYPORT, m_proxyport);

+	DDX_Control(pDX, IDC_PROXYTYPE, m_proxytype);

+	DDX_Control(pDX, IDC_PROXY_ENABLED, m_proxy_enabled);

+	DDX_Control(pDX, IDC_PROXY_AUTH_ENABLED, m_proxy_auth_enabled);

+	DDX_Control(pDX, IDC_PROXYPASS, m_proxypass);

+	DDX_Control(pDX, IDC_PROXYHOST, m_proxyhost);

+	DDX_Control(pDX, IDC_PROXYUSER, m_proxyuser);

+	//}}AFX_DATA_MAP

+}

+

+

+BEGIN_MESSAGE_MAP(CPropConn, CPropertyPage)

+	//{{AFX_MSG_MAP(CPropConn)

+	ON_BN_CLICKED(IDC_PROXY_AUTH_ENABLED, OnProxyAuthEnabled)

+	ON_BN_CLICKED(IDC_PROXY_ENABLED, OnProxyEnabled)

+	//}}AFX_MSG_MAP

+END_MESSAGE_MAP()

+

+/////////////////////////////////////////////////////////////////////////////

+// CPropConn message handlers

+

+void CPropConn::OnProxyAuthEnabled() 

+{

+	m_proxyuser.EnableWindow(m_proxy_enabled.GetCheck() && m_proxy_auth_enabled.GetCheck());

+	m_proxypass.EnableWindow(m_proxy_enabled.GetCheck() && m_proxy_auth_enabled.GetCheck());

+}

+

+void CPropConn::OnProxyEnabled() 

+{

+	// TODO: Add your control notification handler code here

+	m_proxyhost.EnableWindow(m_proxy_enabled.GetCheck());

+	m_proxytype.EnableWindow(m_proxy_enabled.GetCheck());

+	m_proxyport.EnableWindow(m_proxy_enabled.GetCheck());

+	m_proxy_auth_enabled.EnableWindow(m_proxy_enabled.GetCheck());

+

+	if(m_proxy_enabled.GetCheck() && (m_proxytype.GetCurSel() < 0 || m_proxytype.GetCurSel() > 2)) 

+	{

+		m_proxytype.SetCurSel(0);

+	}

+

+	OnProxyAuthEnabled();

+}

+

+void CPropConn::OnOK() 

+{

+	if(!m_proxy_enabled.GetCheck()) {

+		proxytype = PROXY_NONE;

+		return;

+	}

+

+	CString tmp;

+	m_proxyhost.GetWindowText(tmp);

+	strcpy(proxyhost, tmp);

+

+	m_proxyport.GetWindowText(tmp);

+	proxyport = atoi(tmp);

+

+	proxytype = m_proxytype.GetCurSel()+1;

+

+	if(!m_proxy_auth_enabled.GetCheck()) {

+		strcpy(proxyuser, "");

+		strcpy(proxypass, "");

+		return;

+	}

+

+	m_proxyuser.GetWindowText(tmp);

+	strcpy(proxyuser, tmp);

+	m_proxypass.GetWindowText(tmp);

+	strcpy(proxypass, tmp);

+	

+	CPropertyPage::OnOK();

+}

+

+BOOL CPropConn::OnInitDialog() 

+{

+	char pp[20];

+	CPropertyPage::OnInitDialog();

+

+	m_proxyhost.SetWindowText(proxyhost);

+	m_proxyuser.SetWindowText(proxyuser);

+	m_proxypass.SetWindowText(proxypass);

+	g_snprintf(pp, 20, "%d", proxyport);

+	m_proxyport.SetWindowText(pp);

+

+	m_proxytype.AddString("SOCKS 4");

+	m_proxytype.AddString("SOCKS 5");

+	m_proxytype.AddString("HTTP");

+	m_proxytype.SetCurSel(proxytype-1);

+

+	m_proxy_enabled.SetCheck(proxytype == PROXY_NONE?0:1); 

+	m_proxy_auth_enabled.SetCheck(strcmp(proxyuser, "")?1:0);

+

+	OnProxyEnabled();

+	

+	return TRUE;  

+}

diff --git a/win32/PropConn.h b/win32/PropConn.h
new file mode 100644
index 00000000..1143912c
--- /dev/null
+++ b/win32/PropConn.h
@@ -0,0 +1,56 @@
+#if !defined(AFX_PROPCONN_H__8969671F_8D9F_45E9_929F_B36CFEFCBAA2__INCLUDED_)

+#define AFX_PROPCONN_H__8969671F_8D9F_45E9_929F_B36CFEFCBAA2__INCLUDED_

+

+#if _MSC_VER >= 1000

+#pragma once

+#endif // _MSC_VER >= 1000

+// PropConn.h : header file

+//

+

+/////////////////////////////////////////////////////////////////////////////

+// CPropConn dialog

+

+class CPropConn : public CPropertyPage

+{

+// Construction

+public:

+	CPropConn(CWnd* pParent = NULL);   // standard constructor

+

+// Dialog Data

+	//{{AFX_DATA(CPropConn)

+	enum { IDD = IDD_PROPPAGE_CONNECTION };

+	CEdit	m_proxyport;

+	CListBox	m_proxytype;

+	CButton	m_proxy_enabled;

+	CButton	m_proxy_auth_enabled;

+	CEdit	m_proxypass;

+	CEdit	m_proxyhost;

+	CEdit	m_proxyuser;

+	//}}AFX_DATA

+

+

+// Overrides

+	// ClassWizard generated virtual function overrides

+	//{{AFX_VIRTUAL(CPropConn)

+	public:

+	virtual void OnOK();

+	protected:

+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

+	//}}AFX_VIRTUAL

+

+// Implementation

+protected:

+

+	// Generated message map functions

+	//{{AFX_MSG(CPropConn)

+	afx_msg void OnProxyAuthEnabled();

+	afx_msg void OnProxyEnabled();

+	virtual BOOL OnInitDialog();

+	//}}AFX_MSG

+	DECLARE_MESSAGE_MAP()

+};

+

+//{{AFX_INSERT_LOCATION}}

+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

+

+#endif // !defined(AFX_PROPCONN_H__8969671F_8D9F_45E9_929F_B36CFEFCBAA2__INCLUDED_)

diff --git a/win32/PropLog.cpp b/win32/PropLog.cpp
new file mode 100644
index 00000000..27957b07
--- /dev/null
+++ b/win32/PropLog.cpp
@@ -0,0 +1,80 @@
+// PropLog.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "PropLog.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropLog dialog
+
+
+CPropLog::CPropLog()
+	: CPropertyPage(CPropLog::IDD)
+{
+	//{{AFX_DATA_INIT(CPropLog)
+		// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void CPropLog::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CPropLog)
+	DDX_Control(pDX, IDC_LOG, m_log);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropLog, CPropertyPage)
+	//{{AFX_MSG_MAP(CPropLog)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropLog message handlers
+
+static GList *log = NULL;

+

+extern "C" {

+void glib_logger (const gchar *log_domain, GLogLevelFlags log_level, const gchar *msg, gpointer user_data)

+{

+	log = g_list_append(log, g_strdup_printf("%s: %s", log_domain, msg));

+}

+}
+
+void log_message(int level, char *message, ... ) { 
+#define LOG_MAXLEN 300
+	va_list ap;
+	va_start(ap, message);
+	char *msg = (char *)g_malloc(LOG_MAXLEN);
+	g_vsnprintf(msg, LOG_MAXLEN, message, ap);
+	va_end(ap);
+	log = g_list_append(log, msg);
+	if(level == LOGLVL_ERROR) ::MessageBox(NULL, msg, "Bitlbee", MB_OK | MB_ICONINFORMATION);
+	TRACE("%d: %s\n", level, msg);
+}
+
+
+BOOL CPropLog::OnInitDialog() 
+{
+	CPropertyPage::OnInitDialog();
+	
+	m_log.ResetContent();
+	GList *gl = log;
+	while(gl) {
+		char *d = (char *)gl->data;
+		m_log.AddString(d);
+		gl = gl->next;
+	}
+	
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
diff --git a/win32/PropLog.h b/win32/PropLog.h
new file mode 100644
index 00000000..1a847b19
--- /dev/null
+++ b/win32/PropLog.h
@@ -0,0 +1,47 @@
+#if !defined(AFX_PROPLOG_H__F56909E1_BBCC_4163_B9C2_E8D5685A34AA__INCLUDED_)
+#define AFX_PROPLOG_H__F56909E1_BBCC_4163_B9C2_E8D5685A34AA__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// PropLog.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropLog dialog
+
+class CPropLog : public CPropertyPage
+{
+// Construction
+public:
+	CPropLog();   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CPropLog)
+	enum { IDD = IDD_PROPPAGE_LOG };
+	CListBox	m_log;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CPropLog)
+	public:
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CPropLog)
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPLOG_H__F56909E1_BBCC_4163_B9C2_E8D5685A34AA__INCLUDED_)
diff --git a/win32/PropPaths.cpp b/win32/PropPaths.cpp
new file mode 100644
index 00000000..7790e99c
--- /dev/null
+++ b/win32/PropPaths.cpp
@@ -0,0 +1,119 @@
+// PropPaths.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "PropPaths.h"
+#include "shlobj.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropPaths dialog
+
+
+CPropPaths::CPropPaths()
+	: CPropertyPage(CPropPaths::IDD)
+{
+	//{{AFX_DATA_INIT(CPropPaths)
+		// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void CPropPaths::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CPropPaths)
+	DDX_Control(pDX, IDC_MOTDFILE, m_motdfile);
+	DDX_Control(pDX, IDC_EDIT_MOTD, m_edit_motd);
+	DDX_Control(pDX, IDC_CONFIGDIR, m_configdir);
+	DDX_Control(pDX, IDC_BROWSE_MOTD, m_browse_motd);
+	DDX_Control(pDX, IDC_BROWSE_CONFIG, m_browse_config);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropPaths, CPropertyPage)
+	//{{AFX_MSG_MAP(CPropPaths)
+	ON_BN_CLICKED(IDC_BROWSE_CONFIG, OnBrowseConfig)
+	ON_BN_CLICKED(IDC_BROWSE_MOTD, OnBrowseMotd)
+	ON_BN_CLICKED(IDC_EDIT_MOTD, OnEditMotd)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropPaths message handlers
+
+void CPropPaths::OnOK() 
+{
+	CString tmp;
+	g_free((void *)global.conf->configdir);
+	m_configdir.GetWindowText(tmp);
+
+	if (tmp.GetLength() > 0
+		&& tmp.GetAt(tmp.GetLength() - 1) != '/' 
+		&& tmp.GetAt(tmp.GetLength() - 1) != '\\')
+	{
+		global.conf->configdir = g_strdup_printf("%s\\", tmp);
+	} else {
+		global.conf->configdir = g_strdup(tmp);
+	}
+
+	g_free((void *)global.conf->motdfile);
+	m_motdfile.GetWindowText(tmp);
+	global.conf->motdfile = g_strdup(tmp);
+	
+	CPropertyPage::OnOK();
+}
+
+void CPropPaths::OnBrowseConfig() 
+{
+	BROWSEINFO bi = { 0 };
+	bi.lpszTitle = _T("Choose a config directory");
+	LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
+	if( pidl != 0) 
+	{
+		TCHAR path[MAX_PATH];
+		if( SHGetPathFromIDList (pidl, path) ) {
+			m_configdir.SetWindowText(path);
+		}
+
+		IMalloc * imalloc = 0;
+		if ( SUCCEEDED (SHGetMalloc (&imalloc)) )
+		{
+			imalloc->Free(pidl);
+			imalloc->Release();
+		}
+	}
+}
+
+void CPropPaths::OnBrowseMotd() 
+{
+	CFileDialog f(TRUE);
+
+	if(f.DoModal() == IDOK) {
+		m_motdfile.SetWindowText(f.GetPathName());
+	}
+	
+}
+
+void CPropPaths::OnEditMotd() 
+{
+	CString loc;m_motdfile.GetWindowText(loc);
+	ShellExecute(this->GetSafeHwnd(), NULL, loc, NULL, NULL, SW_SHOWNORMAL);	
+}
+
+BOOL CPropPaths::OnInitDialog() 
+{
+	CPropertyPage::OnInitDialog();
+	
+	m_configdir.SetWindowText(global.conf->configdir);
+	m_motdfile.SetWindowText(global.conf->motdfile);
+	
+	return TRUE;  
+}
diff --git a/win32/PropPaths.h b/win32/PropPaths.h
new file mode 100644
index 00000000..89c1c78e
--- /dev/null
+++ b/win32/PropPaths.h
@@ -0,0 +1,55 @@
+#if !defined(AFX_PROPPATHS_H__693C8F02_C150_45DD_99F1_F824795E98C9__INCLUDED_)
+#define AFX_PROPPATHS_H__693C8F02_C150_45DD_99F1_F824795E98C9__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// PropPaths.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropPaths dialog
+
+class CPropPaths : public CPropertyPage
+{
+// Construction
+public:
+	CPropPaths();   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CPropPaths)
+	enum { IDD = IDD_PROPPAGE_PATHS };
+	CEdit	m_motdfile;
+	CButton	m_edit_motd;
+	CEdit	m_configdir;
+	CButton	m_browse_motd;
+	CButton	m_browse_config;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CPropPaths)
+	public:
+	virtual void OnOK();
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CPropPaths)
+	afx_msg void OnBrowseConfig();
+	afx_msg void OnBrowseMotd();
+	afx_msg void OnEditMotd();
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPPATHS_H__693C8F02_C150_45DD_99F1_F824795E98C9__INCLUDED_)
diff --git a/win32/PropUsers.cpp b/win32/PropUsers.cpp
new file mode 100644
index 00000000..7f1a2c35
--- /dev/null
+++ b/win32/PropUsers.cpp
@@ -0,0 +1,120 @@
+// PropUsers.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "PropUsers.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropUsers dialog
+
+
+CPropUsers::CPropUsers()
+	: CPropertyPage(CPropUsers::IDD)
+{
+	//{{AFX_DATA_INIT(CPropUsers)
+		// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void CPropUsers::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CPropUsers)
+	DDX_Control(pDX, IDC_KNOWN_USERS, m_known_users);
+	DDX_Control(pDX, IDC_KICK, m_kick);
+	DDX_Control(pDX, IDC_DEL_KNOWN_USERS, m_del_known_users);
+	DDX_Control(pDX, IDC_CURRENT_USERS, m_current_users);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropUsers, CPropertyPage)
+	//{{AFX_MSG_MAP(CPropUsers)
+	ON_BN_CLICKED(IDC_KICK, OnKick)
+	ON_BN_CLICKED(IDC_DEL_KNOWN_USERS, OnDelKnownUser)
+	ON_LBN_SELCHANGE(IDC_CURRENT_USERS, OnSelchangeCurrentUsers)
+	ON_LBN_SELCHANGE(IDC_KNOWN_USERS, OnSelchangeKnownUsers)
+	ON_BN_CLICKED(IDC_REFRESH_KNOWN_USERS, OnRefreshKnownUsers)
+	ON_BN_CLICKED(IDC_REFRESH_CURRENT_USERS, OnRefreshCurrentUsers)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropUsers message handlers
+
+void CPropUsers::OnKick() 
+{
+	int idx = m_current_users.GetCurSel();
+	if(idx == LB_ERR) return;
+	irc_t *irc = (irc_t *)m_current_users.GetItemData(idx);
+	irc_free(irc);
+	m_kick.EnableWindow(FALSE);
+	OnRefreshCurrentUsers();
+}
+
+void CPropUsers::OnDelKnownUser() 
+{
+	CString nick;
+	m_known_users.GetText(m_known_users.GetCurSel(), nick);
+	CString accounts; accounts.Format("%s\\%s.accounts", global.conf->configdir, nick);
+	CString nicks; nicks.Format("%s\\%s.nicks", global.conf->configdir, nick);
+	CFile::Remove(accounts);
+	CFile::Remove(nicks);
+	m_del_known_users.EnableWindow(FALSE);
+	OnRefreshKnownUsers();
+}
+
+void CPropUsers::OnSelchangeCurrentUsers() 
+{
+	m_kick.EnableWindow(m_current_users.GetCurSel() != LB_ERR);
+	
+}
+
+void CPropUsers::OnSelchangeKnownUsers() 
+{
+	m_del_known_users.EnableWindow(m_known_users.GetCurSel() != LB_ERR);
+	
+}
+
+void CPropUsers::OnRefreshKnownUsers() 
+{
+	m_known_users.ResetContent();
+	GError *error = NULL;
+	const char *r;
+	GDir *d = g_dir_open(global.conf->configdir, 0, &error);
+	if(!d) return;
+	while(r = g_dir_read_name(d)) {
+		if(strstr(r, ".accounts")) {
+			CString tmp(r, strlen(r) - strlen(".accounts"));
+			m_known_users.AddString(tmp);
+		}
+	}
+	g_dir_close(d);
+}

+

+extern "C" {

+	extern GSList *irc_connection_list;

+}
+
+void CPropUsers::OnRefreshCurrentUsers() 
+{
+	m_current_users.ResetContent();
+	GSList *gl = irc_connection_list;
+	while(gl) {
+		irc_t *irc = (irc_t *)gl->data;
+		CString tmp;
+		tmp.Format("%s@%s \"%s\"", irc->nick, irc->myhost, irc->realname);
+		int idx = m_current_users.AddString(tmp);
+		m_current_users.SetItemData(idx, (unsigned long)irc);
+		gl = gl->next;
+	}
+}
+
diff --git a/win32/PropUsers.h b/win32/PropUsers.h
new file mode 100644
index 00000000..7dd028c6
--- /dev/null
+++ b/win32/PropUsers.h
@@ -0,0 +1,54 @@
+#if !defined(AFX_PROPUSERS_H__BA8F6624_F693_403B_B3A8_B140955A894B__INCLUDED_)
+#define AFX_PROPUSERS_H__BA8F6624_F693_403B_B3A8_B140955A894B__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// PropUsers.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropUsers dialog
+
+class CPropUsers : public CPropertyPage
+{
+// Construction
+public:
+	CPropUsers();   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CPropUsers)
+	enum { IDD = IDD_PROPPAGE_USERS };
+	CListBox	m_known_users;
+	CButton	m_kick;
+	CButton	m_del_known_users;
+	CListBox	m_current_users;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CPropUsers)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CPropUsers)
+	afx_msg void OnKick();
+	afx_msg void OnDelKnownUser();
+	afx_msg void OnSelchangeCurrentUsers();
+	afx_msg void OnSelchangeKnownUsers();
+	afx_msg void OnRefreshKnownUsers();
+	afx_msg void OnRefreshCurrentUsers();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPUSERS_H__BA8F6624_F693_403B_B3A8_B140955A894B__INCLUDED_)
diff --git a/win32/TrayNot.cpp b/win32/TrayNot.cpp
new file mode 100644
index 00000000..bd6bf39a
--- /dev/null
+++ b/win32/TrayNot.cpp
@@ -0,0 +1,106 @@
+// TrayNot.cpp : implementation file
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "TrayNot.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrayNot dialog
+
+
+CTrayNot::CTrayNot(CPropertySheet *s)
+	: CDialog(CTrayNot::IDD, NULL)
+{
+	Create(CTrayNot::IDD);
+	EnableWindow(FALSE);
+
+	dlg = s;
+
+	/* Traybar icon */
+	NOTIFYICONDATA dat;
+	dat.cbSize = sizeof(NOTIFYICONDATA);
+	dat.hWnd = m_hWnd;
+	dat.uID = 1;
+	dat.uFlags = NIF_ICON + NIF_TIP + NIF_MESSAGE;
+	dat.hIcon = AfxGetApp()->LoadIcon(IDI_BEE);
+	dat.uCallbackMessage = BITLBEE_TRAY_ICON;
+	strcpy(dat.szTip, "Bitlbee manager");
+	Shell_NotifyIcon(NIM_ADD, &dat);
+
+	//{{AFX_DATA_INIT(CTrayNot)
+		// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void CTrayNot::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CTrayNot)
+		// NOTE: the ClassWizard will add DDX and DDV calls here
+	//}}AFX_DATA_MAP
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrayNot message handlers
+
+CTrayNot::~CTrayNot()
+{
+	NOTIFYICONDATA dat;
+	dat.cbSize = sizeof(NOTIFYICONDATA);
+	dat.hWnd = m_hWnd;
+	dat.uID = 1;
+	Shell_NotifyIcon(NIM_DELETE, &dat);
+}
+
+
+BEGIN_MESSAGE_MAP(CTrayNot, CDialog)
+	//{{AFX_MSG_MAP(CTrayNot)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		ON_MESSAGE (BITLBEE_TRAY_ICON, OnSysTrayIconClick)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrayNot message handlers
+
+afx_msg LONG CTrayNot::OnSysTrayIconClick (WPARAM wParam, LPARAM lParam)
+{
+ switch (lParam)
+    {
+              case WM_LBUTTONDOWN:
+					dlg->ShowWindow(SW_SHOW);
+					break;
+              case WM_RBUTTONDOWN:
+                   ShowQuickMenu ();
+                   break ;
+    }
+ 	return 0;
+}
+
+void CTrayNot::ShowQuickMenu()
+{
+   POINT CurPos;
+
+   CMenu qmenu;
+   qmenu.LoadMenu(IDR_POPUP);
+   
+   GetCursorPos (&CurPos);
+
+   CMenu *submenu = qmenu.GetSubMenu(0);
+
+   SetForegroundWindow();
+   // Display the menu. This menu is a popup loaded elsewhere.
+
+	submenu->TrackPopupMenu (TPM_RIGHTBUTTON | TPM_RIGHTALIGN,
+                   CurPos.x,
+                   CurPos.y,this);
+}
diff --git a/win32/TrayNot.h b/win32/TrayNot.h
new file mode 100644
index 00000000..9dbcb282
--- /dev/null
+++ b/win32/TrayNot.h
@@ -0,0 +1,54 @@
+#if !defined(AFX_TRAYNOT_H__C8B7E607_671B_4C97_8251_AF5AA83DF401__INCLUDED_)
+#define AFX_TRAYNOT_H__C8B7E607_671B_4C97_8251_AF5AA83DF401__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// TrayNot.h : header file
+//

+

+#include <afxwin.h>
+
+#define BITLBEE_TRAY_ICON WM_USER+1
+
+/////////////////////////////////////////////////////////////////////////////
+// CTrayNot dialog
+
+class CTrayNot : public CDialog
+{
+// Construction
+public:
+	virtual  ~CTrayNot();
+	CTrayNot(CPropertySheet *);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CTrayNot)
+	enum { IDD = IDD_PHONY };
+		// NOTE: the ClassWizard will add data members here
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CTrayNot)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CTrayNot)
+		// NOTE: the ClassWizard will add member functions here
+	afx_msg LONG OnSysTrayIconClick (WPARAM wParam, LPARAM lParam);
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+	CPropertySheet *dlg;
+	void ShowQuickMenu();
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_TRAYNOT_H__C8B7E607_671B_4C97_8251_AF5AA83DF401__INCLUDED_)
diff --git a/win32/bitlbee.dsp b/win32/bitlbee.dsp
new file mode 100644
index 00000000..ef0f3ada
--- /dev/null
+++ b/win32/bitlbee.dsp
@@ -0,0 +1,338 @@
+# Microsoft Developer Studio Project File - Name="bitlbee" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Application" 0x0101

+

+CFG=bitlbee - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "bitlbee.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "bitlbee.mak" CFG="bitlbee - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "bitlbee - Win32 Release" (based on "Win32 (x86) Application")

+!MESSAGE "bitlbee - Win32 Debug" (based on "Win32 (x86) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "bitlbee - Win32 Release"

+

+# PROP BASE Use_MFC 6

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 6

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "GLIB2" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

+# ADD 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 iconv.lib glib-2.0.lib gmodule-2.0.lib /nologo /subsystem:windows /machine:I386 /libpath:"release" /libpath:"deps\lib"

+# SUBTRACT LINK32 /incremental:yes /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "bitlbee - Win32 Debug"

+

+# PROP BASE Use_MFC 6

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 6

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "GLIB2" /FR /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 iconv.lib glib-2.0.lib gmodule-2.0.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "bitlbee - Win32 Release"

+# Name "bitlbee - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\account.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\bitlbee.c

+# End Source File

+# Begin Source File

+

+SOURCE=.\bitlbee.rc

+# End Source File

+# Begin Source File

+

+SOURCE=.\bitlbeewin.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\commands.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\crypting.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\debug.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\help.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\irc.c

+# End Source File

+# Begin Source File

+

+SOURCE=.\MainDlg.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\md5.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\nick.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\nogaim.c

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropAccess.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropConn.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropLog.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropPaths.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropUsers.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\proxy.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\query.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\set.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\sha.c

+# End Source File

+# Begin Source File

+

+SOURCE=.\TrayNot.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\user.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\util.c

+

+!IF  "$(CFG)" == "bitlbee - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "bitlbee - Win32 Debug"

+

+# PROP Intermediate_Dir "Debugx"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\account.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\bitlbee.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\bitlbeewin.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\commands.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\conf.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\config.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\crypting.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\help.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ini.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\irc.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\log.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\MainDlg.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\md5.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\nick.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\nogaim.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropAccess.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropConn.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropLog.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropPaths.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\PropUsers.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Resource.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\set.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\sha.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\sock.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TrayNot.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\user.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# Begin Source File

+

+SOURCE=.\res\bitlbee.rc2

+# End Source File

+# Begin Source File

+

+SOURCE=.\res\bmp00002.bmp

+# End Source File

+# Begin Source File

+

+SOURCE=.\res\icon1.ico

+# End Source File

+# Begin Source File

+

+SOURCE=.\res\icon2.ico

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=.\README.TXT

+# End Source File

+# End Target

+# End Project

diff --git a/win32/bitlbee.dsw b/win32/bitlbee.dsw
new file mode 100644
index 00000000..e91fea5e
--- /dev/null
+++ b/win32/bitlbee.dsw
@@ -0,0 +1,107 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "bitlbee"=".\bitlbee.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "bitlbee_ssl"=".\bitlbee_ssl\bitlbee_ssl.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "jabber"=".\jabber.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name bitlbee

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name bitlbee_ssl

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "msn"=".\msn.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name bitlbee

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name bitlbee_ssl

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "oscar"=".\oscar.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name bitlbee

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "yahoo"=".\yahoo.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name bitlbee

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/win32/bitlbee.iss b/win32/bitlbee.iss
new file mode 100644
index 00000000..a9863f3b
--- /dev/null
+++ b/win32/bitlbee.iss
@@ -0,0 +1,73 @@
+; Inno setup script for Bitlbee
+; (C) 2004-2005 Jelmer Vernooij <jelmer@samba.org>
+
+[Setup]
+AppName=BitlBee
+AppPublisher=The BitlBee Team
+AppPublisherURL=http://www.bitlbee.org/
+AppSupportURL=http://win32.bitlbee.org/
+AppUpdatesURL=http://win32.bitlbee.org/
+AppCopyright=Copyright © 2002-2005 The BitlBee Team
+DefaultDirName={pf}\Bitlbee
+DefaultGroupName=Bitlbee
+LicenseFile=..\COPYING
+InfoAfterFile=README.TXT
+OutputDir=.
+AppVerName=Bitlbee-20050516
+OutputBaseFileName="BitlBee-setup"
+
+[Components]
+Name: main; Description: Main executable and files; Types: full compact custom; Flags: fixed;
+Name: "yahoo"; Description: Yahoo! Messenger support; Types: full;
+Name: "oscar"; Description: AIM/ICQ support; Types: full;
+Name: ssl; Description: SSL Support; Types: full;
+Name: "ssl\msn"; Description: MSN messenger support; Types: full;
+Name: "ssl\jabber"; Description: Jabber support; Types: full;
+Name: docs; Description: Documentation; Types: full;
+
+[Tasks]
+Name: startupicon; Description: "&Automatically start when the computer boots"; GroupDescription: "Other tasks:"; Flags: unchecked
+
+[Files]
+Source: "Release\bitlbee.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "Release\libmsn.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl\msn"
+Source: "Deps\lib\ssl3.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\nss3.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\nssckbi.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\smime3.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\softokn3.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\libplc4.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\lib\libnspr4.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Release\libjabber.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl\jabber"
+Source: "Release\bitlbee_ssl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "ssl"
+Source: "Deps\bin\libglib-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "Deps\bin\libgmodule-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "Release\liboscar.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "oscar"
+Source: "Deps\bin\intl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "Deps\bin\iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "Release\libyahoo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: "yahoo"
+Source: "..\motd.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\doc\help.txt"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\doc\TODO"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\doc\README"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\doc\FAQ"; DestDir: "{app}"; Flags: ignoreversion; Components: docs;
+Source: "..\doc\CREDITS"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+; Source: "..\doc\user-guide.pdf"; DestDir: "{app}"; Flags: ignoreversion; Components: docs;
+Source: "..\doc\CHANGES"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+Source: "..\doc\AUTHORS"; DestDir: "{app}"; Flags: ignoreversion; Components: main;
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\Bitlbee"; Filename: "{app}\bitlbee.exe"
+Name: "{commonstartup}\Bitlbee"; Filename: "{app}\bitlbee.exe"; Tasks: startupicon
+
+
+[Run]
+; NOTE: The following entry contains an English phrase ("Launch"). You are free to translate it into another language if required.
+Filename: "{app}\bitlbee.exe"; Description: "Launch Bitlbee"; Flags: nowait postinstall skipifsilent
+
+[Registry]
+Root: HKLM; Subkey: "SOFTWARE\Bitlbee"; ValueType: string; ValueName: "helpfile"; ValueData: "{app}\help.txt"
+Root: HKLM; Subkey: "SOFTWARE\Bitlbee"; ValueType: string; ValueName: "motdfile"; ValueData: "{app}\motd.txt"
+Root: HKLM; Subkey: "SOFTWARE\Bitlbee"; ValueType: string; ValueName: "configdir"; ValueData: "{userappdata}\Bitlbee"
diff --git a/win32/bitlbee.rc b/win32/bitlbee.rc
new file mode 100644
index 00000000..0762fbbd
--- /dev/null
+++ b/win32/bitlbee.rc
@@ -0,0 +1,354 @@
+//Microsoft Developer Studio generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (U.S.) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE DISCARDABLE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE DISCARDABLE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE DISCARDABLE 

+BEGIN

+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"

+    "#define _AFX_NO_OLE_RESOURCES\r\n"

+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"

+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"

+    "\r\n"

+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"

+    "#ifdef _WIN32\r\n"

+    "LANGUAGE 9, 1\r\n"

+    "#pragma code_page(1252)\r\n"

+    "#endif\r\n"

+    "#include ""afxres.rc""         // Standard components\r\n"

+    "#endif\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_BEE                 ICON    DISCARDABLE     "res\\icon2.ico"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Dialog

+//

+

+IDD_PROPPAGE_ACCESS DIALOG DISCARDABLE  0, 0, 210, 154

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Access"

+FONT 8, "MS Sans Serif"

+BEGIN

+    GROUPBOX        "Authentication Mode",IDC_STATIC,7,7,196,47

+    CONTROL         "&Open",IDC_AUTH_OPEN,"Button",BS_AUTORADIOBUTTON | 

+                    WS_GROUP,14,15,181,13

+    CONTROL         "&Closed",IDC_AUTH_CLOSED,"Button",BS_AUTORADIOBUTTON | 

+                    WS_GROUP,14,27,160,11

+    CONTROL         "&Registered",IDC_AUTH_REGISTERED,"Button",

+                    BS_AUTORADIOBUTTON | WS_GROUP,14,39,182,11

+    GROUPBOX        "Bind",IDC_STATIC,7,55,196,46

+    LTEXT           "IP to bind to:",IDC_STATIC,15,67,49,9

+    LTEXT           "Port:",IDC_STATIC,15,82,52,10

+    EDITTEXT        IDC_INTERFACE,86,67,108,11,ES_AUTOHSCROLL

+    EDITTEXT        IDC_PORT,86,82,108,11,ES_AUTOHSCROLL

+    GROUPBOX        "Password",IDC_STATIC,7,104,196,43

+    EDITTEXT        IDC_PASSWORD,14,129,115,11,ES_AUTOHSCROLL

+    LTEXT           "Only used when authentication mode is set to closed.",

+                    IDC_STATIC,13,113,184,11

+END

+

+IDD_PROPPAGE_USERS DIALOG DISCARDABLE  0, 0, 210, 154

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Users"

+FONT 8, "MS Sans Serif"

+BEGIN

+    GROUPBOX        "Known users",IDC_STATIC,7,7,196,68

+    GROUPBOX        "Current users",IDC_STATIC,7,79,196,68

+    LISTBOX         IDC_KNOWN_USERS,13,17,114,52,LBS_SORT | 

+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

+    PUSHBUTTON      "&Remove",IDC_DEL_KNOWN_USERS,133,17,32,14,WS_DISABLED

+    LISTBOX         IDC_CURRENT_USERS,13,89,115,52,LBS_SORT | 

+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

+    PUSHBUTTON      "&Kick",IDC_KICK,135,89,19,14,WS_DISABLED

+    PUSHBUTTON      "&Refresh",IDC_REFRESH_KNOWN_USERS,133,38,30,14

+    PUSHBUTTON      "&Refresh",IDC_REFRESH_CURRENT_USERS,135,110,30,14

+END

+

+IDD_PROPPAGE_PATHS DIALOG DISCARDABLE  0, 0, 210, 154

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Paths"

+FONT 8, "MS Sans Serif"

+BEGIN

+    GROUPBOX        "Config path",IDC_STATIC,7,7,196,30

+    PUSHBUTTON      "&Browse...",IDC_BROWSE_CONFIG,151,16,46,13

+    EDITTEXT        IDC_CONFIGDIR,13,17,122,13,ES_AUTOHSCROLL

+    GROUPBOX        "Message of the day file",IDC_STATIC,7,42,196,40

+    PUSHBUTTON      "&Browse...",IDC_BROWSE_MOTD,153,51,43,13

+    EDITTEXT        IDC_MOTDFILE,13,51,122,13,ES_AUTOHSCROLL

+    PUSHBUTTON      "&Edit...",IDC_EDIT_MOTD,153,66,43,13

+END

+

+IDD_PHONY DIALOG DISCARDABLE  0, 0, 9, 9

+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+CAPTION "Dialog"

+FONT 8, "MS Sans Serif"

+BEGIN

+END

+

+IDD_PROPPAGE_ABOUT DIALOG DISCARDABLE  0, 0, 284, 156

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "About"

+FONT 8, "MS Sans Serif"

+BEGIN

+    GROUPBOX        "Authors",IDC_STATIC,7,7,270,79

+    LTEXT           "Bitlbee is written by : \n  Wilmer van der Gaast <wilmer@gaast.net>\n  Maurits Dijkstra <mauritsd@xs4all.nl>\n  Jelmer Vernooij <jelmer@samba.org>",

+                    IDC_STATIC,13,16,180,35

+    LTEXT           "Windows port by Jelmer Vernooij <jelmer@samba.org>",

+                    IDC_STATIC,13,55,180,12

+    CONTROL         135,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,193,14,73,

+                    64

+    GROUPBOX        "More information",IDC_STATIC,7,88,270,61

+    LTEXT           "See the file CREDITS for a list of contributors.",

+                    IDC_STATIC,16,69,171,11

+    LTEXT           "The Bitlbee homepage is located at http://www.bitlbee.org/\n\nFor Bitlbee support, go to #bitlbee on irc.oftc.net",

+                    IDC_STATIC,17,100,248,39

+END

+

+IDD_PROPPAGE_LOG DIALOG DISCARDABLE  0, 0, 210, 154

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Logs"

+FONT 8, "MS Sans Serif"

+BEGIN

+    LISTBOX         IDC_LOG,7,7,196,140,LBS_SORT | LBS_NOINTEGRALHEIGHT | 

+                    WS_VSCROLL | WS_TABSTOP

+END

+

+IDD_PROPPAGE_CONNECTION DIALOG DISCARDABLE  0, 0, 210, 154

+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

+CAPTION "Connection"

+FONT 8, "MS Sans Serif"

+BEGIN

+    GROUPBOX        "Proxy",IDC_STATIC,7,23,196,124

+    EDITTEXT        IDC_PROXYHOST,110,33,86,12,ES_AUTOHSCROLL

+    CONTROL         "&Use Proxy",IDC_PROXY_ENABLED,"Button",BS_AUTOCHECKBOX | 

+                    WS_TABSTOP,7,7,196,14

+    LTEXT           "Proxy &Host",IDC_STATIC,13,33,82,12

+    EDITTEXT        IDC_PROXYUSER,110,105,86,12,ES_AUTOHSCROLL

+    LTEXT           "Proxy &User",IDC_STATIC,13,105,82,12

+    EDITTEXT        IDC_PROXYPASS,110,122,86,12,ES_PASSWORD | ES_AUTOHSCROLL

+    LTEXT           "Proxy &Password",IDC_STATIC,13,123,82,12

+    CONTROL         "&Authenticate to proxy",IDC_PROXY_AUTH_ENABLED,"Button",

+                    BS_AUTOCHECKBOX | WS_TABSTOP,14,85,86,14

+    LTEXT           "Proxy &Type",IDC_STATIC,13,63,77,8

+    LISTBOX         IDC_PROXYTYPE,110,62,86,31,LBS_SORT | 

+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "&Proxy Port",IDC_STATIC,14,47,80,9

+    EDITTEXT        IDC_PROXYPORT,109,47,86,12,ES_AUTOHSCROLL | ES_NUMBER

+END

+

+

+#ifndef _MAC

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 1,0,0,1

+ PRODUCTVERSION 1,0,0,1

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "The Bitlbee Team\0"

+            VALUE "FileDescription", "BitlBee for Windows\0"

+            VALUE "FileVersion", "1, 0, 0, 1\0"

+            VALUE "InternalName", "bitlbee\0"

+            VALUE "LegalCopyright", "Copyright (C) 2002-2004\0"

+            VALUE "OriginalFilename", "bitlbee.exe\0"

+            VALUE "ProductName", "Bitlbee Application\0"

+            VALUE "ProductVersion", "1, 0, 0, 1\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // !_MAC

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+GUIDELINES DESIGNINFO DISCARDABLE 

+BEGIN

+    IDD_PROPPAGE_ACCESS, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 203

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 147

+    END

+

+    IDD_PROPPAGE_USERS, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 203

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 147

+    END

+

+    IDD_PROPPAGE_PATHS, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 203

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 147

+    END

+

+    IDD_PHONY, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 2

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 2

+    END

+

+    IDD_PROPPAGE_ABOUT, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 277

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 149

+    END

+

+    IDD_PROPPAGE_LOG, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 203

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 147

+    END

+

+    IDD_PROPPAGE_CONNECTION, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 203

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 147

+    END

+END

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Menu

+//

+

+IDR_POPUP MENU DISCARDABLE 

+BEGIN

+    POPUP "tray"

+    BEGIN

+        MENUITEM "&Show",                       IDM_SHOW

+        MENUITEM SEPARATOR

+        MENUITEM "&Exit",                       IDM_EXIT

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_BEE_SMALL           BITMAP  DISCARDABLE     "res\\bmp00002.bmp"

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE DISCARDABLE 

+BEGIN

+    IDS_ABOUTBOX            "&About bitlbee..."

+    IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."

+END

+

+#endif    // English (U.S.) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+#define _AFX_NO_SPLITTER_RESOURCES

+#define _AFX_NO_OLE_RESOURCES

+#define _AFX_NO_TRACKER_RESOURCES

+#define _AFX_NO_PROPERTY_RESOURCES

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE 9, 1

+#pragma code_page(1252)

+#endif

+#include "afxres.rc"         // Standard components

+#endif

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/win32/bitlbee_ssl.dsp b/win32/bitlbee_ssl.dsp
new file mode 100644
index 00000000..5a4e764d
--- /dev/null
+++ b/win32/bitlbee_ssl.dsp
@@ -0,0 +1,99 @@
+# Microsoft Developer Studio Project File - Name="bitlbee_ssl" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=bitlbee_ssl - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "bitlbee_ssl.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "bitlbee_ssl.mak" CFG="bitlbee_ssl - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "bitlbee_ssl - Win32 Release" (based on\

+ "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "bitlbee_ssl - Win32 Debug" (based on\

+ "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "bitlbee_ssl - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /machine:I386

+# ADD 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 libnspr4.lib nss3.lib ssl3.lib ws2_32.lib glib-2.0.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"release" /libpath:"deps\lib"

+

+!ELSEIF  "$(CFG)" == "bitlbee_ssl - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD 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 libnspr4.lib nss3.lib ssl3.lib ws2_32.lib glib-2.0.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "bitlbee_ssl - Win32 Release"

+# Name "bitlbee_ssl - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\protocols\ssl_client.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\ssl_nss.c

+# End Source File

+# End Target

+# End Project

diff --git a/win32/bitlbeewin.cpp b/win32/bitlbeewin.cpp
new file mode 100644
index 00000000..e18ae3cd
--- /dev/null
+++ b/win32/bitlbeewin.cpp
@@ -0,0 +1,210 @@
+// bitlbee.cpp : Defines the class behaviors for the application.
+//
+

+#define BITLBEE_CORE
+#include "bitlbeewin.h"
+#include "traynot.h"
+#include "maindlg.h"

+#include <afxsock.h>
+extern "C" {
+#include "config.h"
+#include "bitlbee.h"
+#include <stdarg.h>
+#include <gmodule.h>

+int

+inet_aton(const char *cp, struct in_addr *addr)

+{

+  addr->s_addr = inet_addr(cp);

+  return (addr->s_addr == INADDR_NONE) ? 0 : 1;

+}

+

+void glib_logger (const gchar *log_domain, GLogLevelFlags log_level, const gchar *msg, gpointer user_data);

+
+}
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CBitlbeeApp
+
+BEGIN_MESSAGE_MAP(CBitlbeeApp, CWinApp)
+	//{{AFX_MSG_MAP(CBitlbeeApp)
+	ON_COMMAND(IDM_EXIT, OnExit)
+	ON_COMMAND(IDM_SHOW, OnShow)
+	//}}AFX_MSG_MAP
+	ON_COMMAND(ID_HELP, CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CBitlbeeApp construction
+
+CBitlbeeApp::CBitlbeeApp()
+{
+	// TODO: add construction code here,
+	// Place all significant initialization in InitInstance
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only CBitlbeeApp object
+
+CBitlbeeApp theApp;
+
+/////////////////////////////////////////////////////////////////////////////
+// CBitlbeeApp initialization

+

+static UINT bb_loop(LPVOID data)

+{

+	g_main_run(global.loop);

+	return 0;

+}
+

+
+gboolean bitlbee_new_client(GIOChannel *src, GIOCondition cond, gpointer data);
+global_t global; // Against global namespace pollution

+
+BOOL CBitlbeeApp::InitInstance()
+{
+	if (!AfxSocketInit())
+	{
+		AfxMessageBox(IDP_SOCKETS_INIT_FAILED);
+		return FALSE;
+	}
+
+	// Standard initialization
+	// If you are not using these features and wish to reduce the size
+	//  of your final executable, you should remove from the following
+	//  the specific initialization routines you do not need.
+
+#ifdef _AFXDLL
+	Enable3dControls();			// Call this when using MFC in a shared DLL
+#else
+	Enable3dControlsStatic();	// Call this when linking to MFC statically
+#endif
+	
+	HKEY key;
+	unsigned char databuf[256];
+	DWORD len;
+	RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee", &key);
+	
+	memset( &global, 0, sizeof( global_t ) );

+	g_log_set_handler("GLib", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION), glib_logger, NULL);

+	global.loop = g_main_new(FALSE);
+	nogaim_init();
+
+	SetRegistryKey("Bitlbee");
+	conf_t *conf = (conf_t *)g_new0( conf_t, 1 );
+	global.conf = conf;
+	global.conf->iface = g_strdup(GetProfileString("main", "interface", "0.0.0.0"));
+	global.conf->port = GetProfileInt("main", "port", 6667);
+	global.conf->verbose = GetProfileInt("main", "verbose", 0);
+	global.conf->password = g_strdup(GetProfileString("main", "password", ""));

+	global.conf->ping_interval = GetProfileInt("main", "ping_interval_timeout", 60);
+	global.conf->hostname = g_strdup(GetProfileString("main", "hostname", "localhost"));
+	if(RegQueryValueEx(key, "configdir", NULL, NULL, databuf, &len) != ERROR_SUCCESS) strcpy((char *)databuf, "");
+	global.conf->configdir = g_strdup(GetProfileString("main", "configdir", (char *)databuf));
+	if(RegQueryValueEx(key, "motdfile", NULL, NULL, databuf, &len) != ERROR_SUCCESS) strcpy((char *)databuf, "");
+	global.conf->motdfile = g_strdup(GetProfileString("main", "motdfile", (char *)databuf));
+	if(RegQueryValueEx(key, "helpfile", NULL, NULL, databuf, &len) != ERROR_SUCCESS) strcpy((char *)databuf, "");
+	global.helpfile = g_strdup(GetProfileString("main", "helpfile", (char *)databuf));
+	global.conf->runmode = RUNMODE_DAEMON;
+	global.conf->authmode = (enum authmode) GetProfileInt("main", "AuthMode", AUTHMODE_CLOSED);
+	strcpy(proxyhost, GetProfileString("proxy", "host", ""));

+	strcpy(proxyuser, GetProfileString("proxy", "user", ""));

+	strcpy(proxypass, GetProfileString("proxy", "password", ""));

+	proxytype = GetProfileInt("proxy", "type", PROXY_NONE);

+	proxyport = GetProfileInt("proxy", "port", 3128);

+
+	dlg = new CMainDlg();
+	not = new CTrayNot(dlg);
+	dlg->ShowWindow(SW_HIDE);
+	m_pMainWnd = not;	
+
+	if(help_init(&(global.help)) == NULL) {
+		log_message(LOGLVL_WARNING, "Unable to initialize help");
+	}
+	
+	if(bitlbee_daemon_init() != 0) {
+		return FALSE;
+	}
+
+	AfxBeginThread(bb_loop, NULL);
+
+
+	return TRUE;
+}
+
+void log_error(char *a) {
+	::MessageBox(NULL, a, "Bitlbee error", MB_OK | MB_ICONEXCLAMATION);
+}
+
+/* Dummy function. log output always goes to screen anyway */
+void log_link(int level, int out) {}
+
+void conf_loaddefaults(irc_t *irc) {}
+double gettime() { 
+	return CTime::GetCurrentTime().GetTime();
+}
+
+void load_protocol(char *name, char *init_function_name, struct prpl *p) {
+	void (*init_function) (struct prpl *);
+
+	char *path = g_module_build_path(NULL, name);
+	if(!path) {
+		log_message(LOGLVL_WARNING, "Can't build path for %s\n", name);
+		return;
+	}
+
+	GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
+	if(!mod) {
+		log_message(LOGLVL_INFO, "Can't find %s, not loading", name);
+		return;
+	}
+
+	if(!g_module_symbol(mod,init_function_name,(void **) &init_function)) {
+		log_message(LOGLVL_WARNING, "Can't find function %s in %s\n", init_function_name, path);
+		return;
+	}
+	g_free(path);
+
+	init_function(p);
+}
+
+void jabber_init(struct prpl *p) { load_protocol("jabber", "jabber_init", p); }
+void msn_init(struct prpl *p) { load_protocol("msn", "msn_init", p); }
+void byahoo_init(struct prpl *p) { load_protocol("yahoo", "byahoo_init", p); }
+void oscar_init(struct prpl *p) { load_protocol("oscar", "oscar_init", p); }
+
+void CBitlbeeApp::OnExit() 
+{
+	AfxGetApp()->ExitInstance();
+	exit(0);
+}
+
+void CBitlbeeApp::OnShow() 
+{
+	dlg->ShowWindow(SW_SHOW);
+}
+
+int CBitlbeeApp::ExitInstance() 
+{
+	WriteProfileString("main", "interface", global.conf->iface);
+	WriteProfileInt("main", "port", global.conf->port);
+	WriteProfileInt("main", "verbose", global.conf->verbose);
+	WriteProfileString("main", "password", global.conf->password);
+	WriteProfileString("main", "configdir", global.conf->configdir);
+	WriteProfileString("main", "hostname", global.conf->hostname);
+	WriteProfileString("main", "motdfile", global.conf->motdfile);
+	WriteProfileInt("main", "authmode", global.conf->authmode);

+	WriteProfileInt("proxy", "type", proxytype);

+	WriteProfileString("proxy", "host", proxyhost);

+	WriteProfileString("proxy", "user", proxyuser);

+	WriteProfileString("proxy", "password", proxypass);

+	WriteProfileInt("proxy", "port", proxyport);

+	WriteProfileInt("main", "ping_interval_timeout", global.conf->ping_interval);
+	delete not;
+	return CWinApp::ExitInstance();
+}
diff --git a/win32/bitlbeewin.h b/win32/bitlbeewin.h
new file mode 100644
index 00000000..1a0d0361
--- /dev/null
+++ b/win32/bitlbeewin.h
@@ -0,0 +1,59 @@
+// bitlbee.h : main header file for the BITLBEE application
+//
+
+#if !defined(AFX_BITLBEE_H__E76A1E72_2177_4477_A796_76D6AB817F80__INCLUDED_)
+#define AFX_BITLBEE_H__E76A1E72_2177_4477_A796_76D6AB817F80__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+

+#include <afxwin.h>

+#include <afxdlgs.h>

+#include <windows.h>

+#include "resource.h"		// main symbols

+
+class CTrayNot;
+extern "C" {
+#define BITLBEE_CORE
+#include "bitlbee.h"
+}

+
+/////////////////////////////////////////////////////////////////////////////
+// CBitlbeeApp:
+// See bitlbee.cpp for the implementation of this class
+//
+
+class CBitlbeeApp : public CWinApp
+{
+public:
+	CBitlbeeApp();
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CBitlbeeApp)
+	public:
+	virtual BOOL InitInstance();
+	virtual int ExitInstance();
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+	//{{AFX_MSG(CBitlbeeApp)
+	afx_msg void OnExit();
+	afx_msg void OnShow();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+	protected:
+		CTrayNot *not;
+		CPropertySheet *dlg;
+		GIOChannel *listen;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_BITLBEE_H__E76A1E72_2177_4477_A796_76D6AB817F80__INCLUDED_)
+

diff --git a/win32/configure.mingw32 b/win32/configure.mingw32
new file mode 100644
index 00000000..678e9243
--- /dev/null
+++ b/win32/configure.mingw32
@@ -0,0 +1,37 @@
+#!/bin/sh
+DEPSDIR=$1
+export PKG_CONFIG_LIBDIR=$DEPSDIR/lib/pkgconfig
+export PKG_CONFIG_OPTS=--define-variable=prefix=$DEPSDIR
+export PKG_CONFIG="pkg-config $PKG_CONFIG_OPTS"
+
+cat<<EOF>config.h
+/* BitlBee settings, generated by $0
+   
+   Do *NOT* use any of these defines in your code without thinking twice, most
+   of them can/will be overridden at run-time */
+#define CPU "i386"
+#define IPV6
+#define GLIB2
+#define ARCH "Windows"
+EOF
+
+cat<<EOF>Makefile.settings
+## BitlBee settings, generated by $0
+PREFIX=
+BINDIR=\$(PREFIX)/sbin/
+ETCDIR=\$(PREFIX)/etc/bitlbee/
+MANDIR=\$(PREFIX)/share/man/
+DATADIR=\$(PREFIX)/share/bitlbee/
+CONFIG=\$(PREFIX)/lib/bitlbee/
+ARCH=Windows
+CPU=i386
+OUTFILE=bitlbee.exe
+STRIP=i586-mingw32msvc-strip 
+
+DESTDIR=
+LFLAGS=`$PKG_CONFIG --libs glib-2.0` -L$DEPSDIR/lib -lws2_32 -liconv
+CFLAGS=`$PKG_CONFIG --cflags glib-2.0` -I$DEPSDIR/include -I`pwd` -I`pwd`/protocols
+CC=i586-mingw32msvc-gcc
+CXX=i586-mingw32msvc-g++
+LD=i586-mingw32msvc-ld
+EOF
diff --git a/win32/jabber.dsp b/win32/jabber.dsp
new file mode 100644
index 00000000..ce5b08c7
--- /dev/null
+++ b/win32/jabber.dsp
@@ -0,0 +1,228 @@
+# Microsoft Developer Studio Project File - Name="jabber" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=jabber - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "jabber.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "jabber.mak" CFG="jabber - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "jabber - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "jabber - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "jabber - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "jabrel"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\protocols\jabber" /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /machine:I386

+# ADD 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 ws2_32.lib iconv.lib glib-2.0.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/libjabber.dll" /libpath:"release" /libpath:"deps\lib"

+

+!ELSEIF  "$(CFG)" == "jabber - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "jabber__"

+# PROP BASE Intermediate_Dir "jabber__"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "jabdeb"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\protocols\jabber" /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 odbc32.lib glib-2.0.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbccp32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/libjabber.dll" /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "jabber - Win32 Release"

+# Name "jabber - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\protocols\jabber\asciitab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\expat.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\genhash.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\hashtable.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\hashtable.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\iasciitab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jabber.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jabber.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jconn.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jid.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jpacket.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\jutil.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\karma.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\latin1tab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\libxode.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\log.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\log.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\nametab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\pool.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\pproxy.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\rate.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\str.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\utf8tab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xhash.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmldef.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmlnode.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmlparse.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmlparse.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmlrole.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmlrole.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmltok.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmltok.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xmltok_impl.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\jabber\xstream.c

+# End Source File

+# End Target

+# End Project

diff --git a/win32/msn.dsp b/win32/msn.dsp
new file mode 100644
index 00000000..4c5fcfb3
--- /dev/null
+++ b/win32/msn.dsp
@@ -0,0 +1,116 @@
+# Microsoft Developer Studio Project File - Name="msn" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=msn - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "msn.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "msn.mak" CFG="msn - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "msn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "msn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "msn - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "msnrel"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "e:\dev\include\nss" /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /machine:I386

+# ADD 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 ws2_32.lib iconv.lib glib-2.0.lib nss3.lib libnspr4.lib ssl3.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/libmsn.dll" /libpath:"release" /libpath:"deps\lib"

+

+!ELSEIF  "$(CFG)" == "msn - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "msn___Wi"

+# PROP BASE Intermediate_Dir "msn___Wi"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "msndeb"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 odbc32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbccp32.lib ws2_32.lib glib-2.0.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/libmsn.dll" /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "msn - Win32 Release"

+# Name "msn - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\protocols\msn\msn.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\msn\msn_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\msn\ns.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\msn\passport.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\msn\sb.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\msn\tables.c

+# End Source File

+# End Target

+# End Project

diff --git a/win32/oscar.dsp b/win32/oscar.dsp
new file mode 100644
index 00000000..aa2242ba
--- /dev/null
+++ b/win32/oscar.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="oscar" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=oscar - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "oscar.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "oscar.mak" CFG="oscar - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "oscar - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "oscar - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "oscar - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "oscarrel"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\protocols\oscar" /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /machine:I386

+# ADD 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 iconv.lib ws2_32.lib glib-2.0.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/liboscar.dll" /libpath:"release" /libpath:"deps\lib"

+

+!ELSEIF  "$(CFG)" == "oscar - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "oscar___"

+# PROP BASE Intermediate_Dir "oscar___"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "oscdeb"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\protocols\oscar" /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 gmodule-2.0.lib ws2_32.lib glib-2.0.lib iconv.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/liboscar.dll" /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "oscar - Win32 Release"

+# Name "oscar - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\protocols\oscar\admin.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\aim.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\aim_cbtypes.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\aim_internal.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\auth.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\bos.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\buddylist.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\chat.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\chatnav.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\conn.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\faimconfig.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\ft.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\icq.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\im.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\info.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\misc.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\msgcookie.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\oscar.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\oscar_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\rxhandlers.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\rxqueue.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\search.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\service.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\snac.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\ssi.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\stats.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\tlv.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\oscar\txqueue.c

+# End Source File

+# End Target

+# End Project

diff --git a/win32/res/bmp00002.bmp b/win32/res/bmp00002.bmp
new file mode 100644
index 00000000..77205cb1
--- /dev/null
+++ b/win32/res/bmp00002.bmp
diff --git a/win32/res/icon2.ico b/win32/res/icon2.ico
new file mode 100644
index 00000000..5dfe084f
--- /dev/null
+++ b/win32/res/icon2.ico
diff --git a/win32/resource.h b/win32/resource.h
new file mode 100644
index 00000000..f655c545
--- /dev/null
+++ b/win32/resource.h
@@ -0,0 +1,60 @@
+//{{NO_DEPENDENCIES}}

+// Microsoft Developer Studio generated include file.

+// Used by bitlbee.rc

+//

+#define IDM_ABOUTBOX                    0x0010

+#define IDD_ABOUTBOX                    100

+#define IDS_ABOUTBOX                    101

+#define IDC_OK                          101

+#define IDD_BITLBEE_DIALOG              102

+#define IDP_SOCKETS_INIT_FAILED         103

+#define IDD_PROPPAGE_ACCESS             106

+#define IDD_PROPPAGE_USERS              107

+#define IDD_PROPPAGE_PATHS              108

+#define IDR_MAINFRAME                   128

+#define IDI_BEE                         130

+#define IDD_PHONY                       131

+#define IDR_POPUP                       132

+#define IDD_PROPPAGE_ABOUT              132

+#define IDD_PROPPAGE_LOG                133

+#define IDB_BEE_SMALL                   135

+#define IDD_PROPPAGE_CONNECTION         137

+#define IDI_ICON1                       138

+#define IDC_AUTH_OPEN                   1001

+#define IDC_AUTH_CLOSED                 1002

+#define IDC_AUTH_REGISTERED             1003

+#define IDC_BROWSE_CONFIG               1004

+#define IDC_CONFIGDIR                   1005

+#define IDC_BROWSE_MOTD                 1006

+#define IDC_KNOWN_USERS                 1007

+#define IDC_MOTDFILE                    1007

+#define IDC_EDIT_MOTD                   1008

+#define IDC_DEL_KNOWN_USERS             1008

+#define IDC_CURRENT_USERS               1009

+#define IDC_KICK                        1010

+#define IDC_INTERFACE                   1011

+#define IDC_PORT                        1012

+#define IDC_PASSWORD                    1013

+#define IDC_REFRESH_KNOWN_USERS         1015

+#define IDC_REFRESH_CURRENT_USERS       1016

+#define IDC_LOG                         1017

+#define IDC_PROXYHOST                   1018

+#define IDC_PROXYUSER                   1019

+#define IDC_PROXYPASS                   1020

+#define IDC_PROXY_ENABLED               1021

+#define IDC_PROXY_AUTH_ENABLED          1022

+#define IDC_PROXYPORT                   1023

+#define IDC_PROXYTYPE                   1024

+#define IDM_SHOW                        32771

+#define IDM_EXIT                        32773

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        139

+#define _APS_NEXT_COMMAND_VALUE         32774

+#define _APS_NEXT_CONTROL_VALUE         1025

+#define _APS_NEXT_SYMED_VALUE           102

+#endif

+#endif

diff --git a/win32/yahoo.dsp b/win32/yahoo.dsp
new file mode 100644
index 00000000..ebfc4eef
--- /dev/null
+++ b/win32/yahoo.dsp
@@ -0,0 +1,152 @@
+# Microsoft Developer Studio Project File - Name="yahoo" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=yahoo - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "yahoo.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "yahoo.mak" CFG="yahoo - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "yahoo - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "yahoo - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "yahoo - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "yahrel"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /machine:I386

+# ADD 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 ws2_32.lib iconv.lib glib-2.0.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/libyahoo.dll" /libpath:"release" /libpath:"deps\lib"

+

+!ELSEIF  "$(CFG)" == "yahoo - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "yahoo___"

+# PROP BASE Intermediate_Dir "yahoo___"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "yahdeb"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\protocols" /I ".." /I "deps\include" /I "deps\include\glib-2.0" /I "deps\lib\glib-2.0\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_CONFIG_H" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 ws2_32.lib glib-2.0.lib gmodule-2.0.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/libyahoo.dll" /pdbtype:sept /libpath:"debug" /libpath:"deps\lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "yahoo - Win32 Release"

+# Name "yahoo - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\crypt.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\libyahoo2.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo2.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo2_callbacks.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo2_types.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_debug.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_fn.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_fn.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_httplib.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_httplib.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_list.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_list.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\protocols\yahoo\yahoo_util.h

+# End Source File

+# End Target

+# End Project