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

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

Revision: 655
          http://svn.sourceforge.net/dcplusplus/?rev=655&view=rev
Author:   arnetheduck
Date:     2006-09-22 14:23:35 -0700 (Fri, 22 Sep 2006)

Log Message:
-----------
patches

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/client/AdcHub.cpp
    dcplusplus/trunk/client/NmdcHub.cpp
    dcplusplus/trunk/windows/LogPage.cpp

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2006-09-20 09:53:26 UTC (rev 654)
+++ dcplusplus/trunk/changelog.txt	2006-09-22 21:23:35 UTC (rev 655)
@@ -13,6 +13,9 @@
 * Fixed some SSL connection issues
 * Fixed on-the-fly compression of file lists
 * [bug 1055] Stopped files.xml.bz2 from being deleted on linux (thanks dorian)
+* [bug 1061] Log page fix (thanks fleetcommand)
+* [bug 1033] Altered NMDC hubname/description detection slightly (thanks fleetcommand)
+* [bug 1059] Fixed the possibility for users to become hidden in some cases (thanks fleetcommand)
 
 -- 0.695 2006-09-10 --
 * PM popup/ignore options updated, in nmdc a hub is any nick which hasn't sent a hello or myinfo, and a bot is a nick with myinfo

Modified: dcplusplus/trunk/client/AdcHub.cpp
===================================================================
--- dcplusplus/trunk/client/AdcHub.cpp	2006-09-20 09:53:26 UTC (rev 654)
+++ dcplusplus/trunk/client/AdcHub.cpp	2006-09-22 21:23:35 UTC (rev 655)
@@ -395,13 +395,13 @@
 		return;
 
 	const string& proto = secure ? SECURE_CLIENT_PROTOCOL : CLIENT_PROTOCOL;
-	short port = secure ? ConnectionManager::getInstance()->getSecurePort() : ConnectionManager::getInstance()->getPort();
-	if(port == 0) {
-		// Oops?
-		LogManager::getInstance()->message(STRING(NOT_LISTENING));
-		return;
-	}
 	if(ClientManager::getInstance()->isActive()) {
+		short port = secure ? ConnectionManager::getInstance()->getSecurePort() : ConnectionManager::getInstance()->getPort();
+		if(port == 0) {
+			// Oops?
+			LogManager::getInstance()->message(STRING(NOT_LISTENING));
+			return;
+		}
 		send(AdcCommand(AdcCommand::CMD_CTM, user.getIdentity().getSID()).addParam(proto).addParam(Util::toString(port)).addParam(token));
 	} else {
 		send(AdcCommand(AdcCommand::CMD_RCM, user.getIdentity().getSID()).addParam(proto));

Modified: dcplusplus/trunk/client/NmdcHub.cpp
===================================================================
--- dcplusplus/trunk/client/NmdcHub.cpp	2006-09-20 09:53:26 UTC (rev 654)
+++ dcplusplus/trunk/client/NmdcHub.cpp	2006-09-22 21:23:35 UTC (rev 655)
@@ -340,6 +340,12 @@
 
 		OnlineUser& u = getUser(nick);
 
+		// If he is already considered to be the hub (thus hidden), probably should appear in the UserList
+		if(u.getIdentity().isHidden()) {
+			u.getIdentity().setHidden(false);
+			u.getIdentity().setHub(false);
+		}
+
 		j = param.find('$', i);
 		if(j == string::npos)
 			return;
@@ -453,14 +459,22 @@
 	} else if(cmd == "$SR") {
 		SearchManager::getInstance()->onSearchResult(aLine);
 	} else if(cmd == "$HubName") {
-		// Hack - first word goes to hub name, rest to description
-		string::size_type i = param.find(' ');
+		// If " - " found, the first part goes to hub name, rest to description
+		// If no " - " found, first word goes to hub name, rest to description
+
+		string::size_type i = param.find(" - ");
 		if(i == string::npos) {
-			getHubIdentity().setNick(unescape(param));
-			getHubIdentity().setDescription(Util::emptyString);
+			i = param.find(' ');
+			if(i == string::npos) {
+				getHubIdentity().setNick(unescape(param));
+				getHubIdentity().setDescription(Util::emptyString);			
+			} else {
+				getHubIdentity().setNick(unescape(param.substr(0, i)));
+				getHubIdentity().setDescription(unescape(param.substr(i+1)));
+			}
 		} else {
 			getHubIdentity().setNick(unescape(param.substr(0, i)));
-			getHubIdentity().setDescription(unescape(param.substr(i+1)));
+			getHubIdentity().setDescription(unescape(param.substr(i+3)));
 		}
 		fire(ClientListener::HubUpdated(), this);
 	} else if(cmd == "$Supports") {

Modified: dcplusplus/trunk/windows/LogPage.cpp
===================================================================
--- dcplusplus/trunk/windows/LogPage.cpp	2006-09-20 09:53:26 UTC (rev 654)
+++ dcplusplus/trunk/windows/LogPage.cpp	2006-09-22 21:23:35 UTC (rev 655)
@@ -65,6 +65,9 @@
 		options.push_back(pair);
 	}
 
+	::EnableWindow(GetDlgItem(IDC_LOG_FORMAT), false);
+	::EnableWindow(GetDlgItem(IDC_LOG_FILE), false);
+
 	oldSelection = -1;
 
 	// Do specialized reading here


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