the fixes to the above compilation problems are trivial. the real problem is that this version (cvs-20041115) also exposes the behavior described in the earlier posts. also starting from cvs-20041104 amule messes up ipfiler.dat
if anyone wants to compile 20041115 here is the patch:
diff -Naur amule-cvs-20041115/src/server.h amule-cvs-20041115.fixed/src/server.h
--- amule-cvs-20041115/src/server.h 2004-11-14 18:29:05.000000000 +0100
+++ amule-cvs-20041115.fixed/src/server.h 2004-11-15 19:19:26.000000000 +0100
@@ -58,12 +58,12 @@
CServer(CServer* pOld);
~CServer();
void AddTag(CTag* in_tag) {taglist->Append(in_tag);}
- const wxString GetListName() const {return char2unicode(listname);}
+ const wxString GetListName() const {return listname;}
const wxString& GetFullIP() const {return ipfull;}
const wxString GetAddress() const {
if (!dynip.IsEmpty()) {
- return char2unicode(dynip);
+ return dynip;
} else {
return ipfull;
}
@@ -76,7 +76,7 @@
uint32 GetIP() const {return ip;}
uint32 GetFiles() const {return files;}
uint32 GetUsers() const {return users;}
- const wxString GetDescription() const {return char2unicode(description);}
+ const wxString GetDescription() const {return description;}
uint32 GetPing() const {return ping;}
uint32 GetPreferences() const {return preferences;}
uint32 GetMaxUsers() const {return maxusers;}
@@ -102,7 +102,7 @@
void SetSoftFiles(uint32 in_softfiles) {softfiles = in_softfiles;}
uint32 GetHardFiles() const {return hardfiles;}
void SetHardFiles(uint32 in_hardfiles) {hardfiles = in_hardfiles;}
- const wxString GetVersion() const {return char2unicode(m_strVersion);}
+ const wxString GetVersion() const {return m_strVersion;}
void SetVersion(wxString pszVersion) {m_strVersion = pszVersion;}
void SetTCPFlags(uint32 uFlags) {m_uTCPFlags = uFlags;}
uint32 GetTCPFlags() const {return m_uTCPFlags;}
diff -Naur amule-cvs-20041115/src/ServerListCtrl.cpp amule-cvs-20041115.fixed/src/ServerListCtrl.cpp
--- amule-cvs-20041115/src/ServerListCtrl.cpp 2004-11-14 11:59:51.000000000 +0100
+++ amule-cvs-20041115.fixed/src/ServerListCtrl.cpp 2004-11-15 19:19:53.000000000 +0100
@@ -200,7 +200,7 @@
SetItem( itemnr, COLUMN_SERVER_NAME, server->GetListName() );
SetItem( itemnr, COLUMN_SERVER_ADDR, server->GetAddress() );
- SetItem( itemnr, COLUMN_SERVER_PORT, wxString::Format("%i", server->GetPort()) );
+ SetItem( itemnr, COLUMN_SERVER_PORT, wxString::Format( wxT("%i"), server->GetPort()) );
SetItem( itemnr, COLUMN_SERVER_DESC, server->GetDescription() );
if ( server->GetPing() ) {