[Dcplusplus-commit] SF.net SVN: dcplusplus: [669] dcplusplus/trunk

[<arn...@us...>]

Revision: 669
          http://svn.sourceforge.net/dcplusplus/?rev=669&view=rev
Author:   arnetheduck
Date:     2006-10-09 23:36:40 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
lockup fix

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/client/AdcCommand.h
    dcplusplus/trunk/client/ConnectionManager.h
    dcplusplus/trunk/client/FavoriteManager.cpp
    dcplusplus/trunk/client/QueueManager.cpp
    dcplusplus/trunk/windows/HubFrame.cpp
    dcplusplus/trunk/windows/HubFrame.h

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/changelog.txt	2006-10-10 06:36:40 UTC (rev 669)
@@ -12,6 +12,8 @@
 * Removed unmaintained autoconf files
 * Reworked match listing to make it slightly faster
 * Fixed a few random crashes
+* [ADC] Removed obsolete DSC command
+* Fixed user list not being updated in some cases
 
 -- 0.697 2006-09-29 --
 * [ADC] Fixed a few protocol issues

Modified: dcplusplus/trunk/client/AdcCommand.h
===================================================================
--- dcplusplus/trunk/client/AdcCommand.h	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/client/AdcCommand.h	2006-10-10 06:36:40 UTC (rev 669)
@@ -98,7 +98,6 @@
 	C(GPA, 'G','P','A');
 	C(PAS, 'P','A','S');
 	C(QUI, 'Q','U','I');
-	C(DSC, 'D','S','C');
 	C(GET, 'G','E','T');
 	C(GFI, 'G','F','I');
 	C(SND, 'S','N','D');
@@ -190,7 +189,6 @@
 				C(GPA);
 				C(PAS);
 				C(QUI);
-				C(DSC);
 				C(GET);
 				C(GFI);
 				C(SND);

Modified: dcplusplus/trunk/client/ConnectionManager.h
===================================================================
--- dcplusplus/trunk/client/ConnectionManager.h	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/client/ConnectionManager.h	2006-10-10 06:36:40 UTC (rev 669)
@@ -70,7 +70,7 @@
 		expectedConnections.insert(make_pair(aNick, make_pair(aMyNick, aHubUrl)));
 	}
 
-	pair<string, string> remove(const string& aNick) {
+	StringPair remove(const string& aNick) {
 		Lock l(cs);
 		ExpectMap::iterator i = expectedConnections.find(aNick);
 

Modified: dcplusplus/trunk/client/FavoriteManager.cpp
===================================================================
--- dcplusplus/trunk/client/FavoriteManager.cpp	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/client/FavoriteManager.cpp	2006-10-10 06:36:40 UTC (rev 669)
@@ -404,12 +404,6 @@
 	addUserCommand(UserCommand::TYPE_RAW_ONCE, UserCommand::CONTEXT_CHAT | UserCommand::CONTEXT_SEARCH, UserCommand::FLAG_NOSAVE,
 		STRING(REDIRECT_USER), redirstr, "op");
 
-	// Add ADC standard op commands
-	static const char adc_disconnectstr[] =
-		"HDSC %[userSID]\n";
-	addUserCommand(UserCommand::TYPE_RAW_ONCE, UserCommand::CONTEXT_CHAT | UserCommand::CONTEXT_SEARCH, UserCommand::FLAG_NOSAVE,
-		STRING(DISCONNECT_USER), adc_disconnectstr, "adc://op");
-
 	try {
 		SimpleXML xml;
 		xml.fromXML(File(getConfigFile(), File::READ, File::OPEN).read());

Modified: dcplusplus/trunk/client/QueueManager.cpp
===================================================================
--- dcplusplus/trunk/client/QueueManager.cpp	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/client/QueueManager.cpp	2006-10-10 06:36:40 UTC (rev 669)
@@ -633,7 +633,11 @@
 				continue;
 			TTHMap::iterator j = tthMap.find(qi->getTTH());
 			if(j != tthMap.end() && i->second->getSize() == qi->getSize()) {
-				addSource(qi, dl.getUser(), QueueItem::Source::FLAG_FILE_NOT_AVAILABLE);
+				try {
+					addSource(qi, dl.getUser(), QueueItem::Source::FLAG_FILE_NOT_AVAILABLE);
+				} catch(...) {
+					// Ignore...
+				}
 				matches++;
 			}
 		}

Modified: dcplusplus/trunk/windows/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/windows/HubFrame.cpp	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/windows/HubFrame.cpp	2006-10-10 06:36:40 UTC (rev 669)
@@ -1207,7 +1207,7 @@
 	}
 }
 
-void HubFrame::on(Second, DWORD /*aTick*/) throw() {
+void HubFrame::on(Second, uint32_t /*aTick*/) throw() {
 	updateStatusBar();
 	if(updateUsers) {
 		updateUsers = false;

Modified: dcplusplus/trunk/windows/HubFrame.h
===================================================================
--- dcplusplus/trunk/windows/HubFrame.h	2006-10-08 22:22:19 UTC (rev 668)
+++ dcplusplus/trunk/windows/HubFrame.h	2006-10-10 06:36:40 UTC (rev 669)
@@ -375,7 +375,7 @@
 	void updateStatusBar() { if(m_hWnd) speak(STATS); }
 
 	// TimerManagerListener
-	virtual void on(TimerManagerListener::Second, DWORD /*aTick*/) throw();
+	virtual void on(TimerManagerListener::Second, uint32_t /*aTick*/) throw();
 
 	// ClientListener
 	virtual void on(Connecting, Client*) throw();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.