linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2974
committer: cologic <ne5@xxxxxxxxxxx>
branch nick: dcpp2
timestamp: Sun 2012-07-01 15:24:30 -0400
message:
  a couple of plugin API build fixes
modified:
  dcpp/PluginApiImpl.cpp
  win32/QueueFrame.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/PluginApiImpl.cpp'
--- dcpp/PluginApiImpl.cpp	2012-07-01 18:41:13 +0000
+++ dcpp/PluginApiImpl.cpp	2012-07-01 19:24:30 +0000
@@ -538,7 +538,7 @@
 		Client* client = ClientManager::getInstance()->getClient(url);
 		client->connect();
 		client->setPassword(password);
-		client->settings.setNick(nick);
+		client->get(HubSettings::Nick) = nick;
 
 		// check that socket is waitting for connection...
 		if(client->isConnected()) {

=== modified file 'win32/QueueFrame.cpp'
--- win32/QueueFrame.cpp	2012-06-23 12:31:10 +0000
+++ win32/QueueFrame.cpp	2012-07-01 19:24:30 +0000
@@ -119,7 +119,8 @@
 
 	setTimer([this]() -> bool { updateStatus(); return true; }, 500);
 
-	QueueManager::getInstance()->addListener(this, [this](const QueueItem::StringMap& qsm) { addQueueList(qsm); });
+	QueueManager::getInstance()->addListener(this);
+	QueueManager::getInstance()->lockedOperation([this](const QueueItem::StringMap& qsm) { addQueueList(qsm); });
 
 	layout();
 }