From b6da50f75b78e014abf51c23da75d1d8267631a1 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Tue, 11 May 2010 21:59:30 +0000
Subject: [PATCH] Upstream tarball 10145

---
 .svn-revision                   | 2 +-
 src/DownloadListCtrl.cpp        | 2 +-
 src/GenericClientListCtrl.h     | 2 +-
 src/GuiEvents.cpp               | 6 +++---
 src/SharedFilePeersListCtrl.cpp | 2 +-
 src/SourceListCtrl.cpp          | 2 +-
 src/TransferWnd.cpp             | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 75525739..918187f8 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10144
+10145
diff --git a/src/DownloadListCtrl.cpp b/src/DownloadListCtrl.cpp
index 1c473696..ee201136 100644
--- a/src/DownloadListCtrl.cpp
+++ b/src/DownloadListCtrl.cpp
@@ -583,7 +583,7 @@ void CDownloadListCtrl::OnItemActivated( wxListEvent& evt )
 	}	
 }
 
-void CDownloadListCtrl::OnItemSelectionChanged( wxListEvent& evt )
+void CDownloadListCtrl::OnItemSelectionChanged( wxListEvent& )
 {	
 	if (!IsSorting()) {
 		CKnownFileVector filesVector;
diff --git a/src/GenericClientListCtrl.h b/src/GenericClientListCtrl.h
index 8d6d90bf..07a61d20 100644
--- a/src/GenericClientListCtrl.h
+++ b/src/GenericClientListCtrl.h
@@ -59,7 +59,7 @@ enum GenericColumnEnum {
 
 struct CGenericClientListCtrlColumn {
 	GenericColumnEnum cid;
-	wxChar* name;
+	wxString name;
 	int width;
 };
 
diff --git a/src/GuiEvents.cpp b/src/GuiEvents.cpp
index 737b249d..ddcb31ea 100644
--- a/src/GuiEvents.cpp
+++ b/src/GuiEvents.cpp
@@ -317,7 +317,7 @@ namespace MuleNotify
 #endif
 	}
 	
-	void SourceCtrlUpdateSource(CUpDownClient* source, SourceItemType type)
+	void SourceCtrlUpdateSource(CUpDownClient* NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
 	{
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
@@ -344,7 +344,7 @@ namespace MuleNotify
 #endif
 	}
 	
-	void SharedCtrlAddClient(CKnownFile* NOT_ON_DAEMON(owner), CUpDownClient* NOT_ON_DAEMON(source), SourceItemType type)
+	void SharedCtrlAddClient(CKnownFile* NOT_ON_DAEMON(owner), CUpDownClient* NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
 	{
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
@@ -353,7 +353,7 @@ namespace MuleNotify
 #endif
 	}
 	
-	void SharedCtrlRefreshClient(CUpDownClient* NOT_ON_DAEMON(client), SourceItemType type)
+	void SharedCtrlRefreshClient(CUpDownClient* NOT_ON_DAEMON(client), SourceItemType NOT_ON_DAEMON(type))
 	{
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
diff --git a/src/SharedFilePeersListCtrl.cpp b/src/SharedFilePeersListCtrl.cpp
index 4764b494..967f09fd 100644
--- a/src/SharedFilePeersListCtrl.cpp
+++ b/src/SharedFilePeersListCtrl.cpp
@@ -61,7 +61,7 @@ CSharedFilePeersListCtrl::~CSharedFilePeersListCtrl()
 
 int CSharedFilePeersListCtrl::SourceSortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
 {
-	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | sortData & CMuleListCtrl::SORT_DES);
+	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | (sortData & CMuleListCtrl::SORT_DES));
 }
 
 // File_checked_for_headers
diff --git a/src/SourceListCtrl.cpp b/src/SourceListCtrl.cpp
index 5e944ef8..b7e496ae 100644
--- a/src/SourceListCtrl.cpp
+++ b/src/SourceListCtrl.cpp
@@ -59,7 +59,7 @@ CSourceListCtrl::~CSourceListCtrl()
 
 int CSourceListCtrl::SourceSortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
 {
-	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | sortData & CMuleListCtrl::SORT_DES);
+	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | (sortData & CMuleListCtrl::SORT_DES));
 }
 
 // File_checked_for_headers
diff --git a/src/TransferWnd.cpp b/src/TransferWnd.cpp
index 38a03f7e..6ae316e2 100644
--- a/src/TransferWnd.cpp
+++ b/src/TransferWnd.cpp
@@ -302,7 +302,7 @@ void CTransferWnd::OnSetDefaultCat( wxCommandEvent& event )
 }
 
 
-void CTransferWnd::ShowQueueCount(uint32 number)
+void CTransferWnd::ShowQueueCount(uint32 /*number*/)
 {
 #if 0
 	wxString str = wxString::Format( wxT("%u (%u %s)"), number, theStats::GetBannedCount(), _("Banned") );
-- 
2.11.4.GIT