linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2309
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-11-27 15:48:00 +0100
message:
  it's not RM but RX to remove search exts from groups
modified:
  dcpp/AdcHub.cpp
  dcpp/ShareManager.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/AdcHub.cpp'
--- dcpp/AdcHub.cpp	2010-11-19 15:11:20 +0000
+++ dcpp/AdcHub.cpp	2010-11-27 14:48:00 +0000
@@ -848,7 +848,7 @@
 							diff = temp.erase(diff);
 						}
 					}
-					if(!ok) // too many "RM"s necessary - disregard this group
+					if(!ok) // too many "RX"s necessary - disregard this group
 						continue;
 
 					// let's include this group!
@@ -857,7 +857,7 @@
 					exts = temp; // the exts to still add (that were not defined in the group)
 
 					for(auto rmi = rm.cbegin(), rmiend = rm.cend(); rmi != rmiend; ++rmi)
-						c.addParam("RM", *rmi);
+						c.addParam("RX", *rmi);
 
 					if(exts.size() <= 2)
 						break;

=== modified file 'dcpp/ShareManager.cpp'
--- dcpp/ShareManager.cpp	2010-11-23 17:14:48 +0000
+++ dcpp/ShareManager.cpp	2010-11-27 14:48:00 +0000
@@ -1219,7 +1219,7 @@
 		} else if(toCode('G', 'R') == cmd) {
 			auto exts = AdcHub::parseSearchExts(Util::toInt(p.substr(2)));
 			ext.insert(ext.begin(), exts.begin(), exts.end());
-		} else if(toCode('R', 'M') == cmd) {
+		} else if(toCode('R', 'X') == cmd) {
 			noExt.push_back(p.substr(2));
 		} else if(toCode('G', 'E') == cmd) {
 			gt = Util::toInt64(p.substr(2));