linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2801
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-01-08 13:47:07 +0100
message:
  partial lists on NMDC hubs too
modified:
  dwt/src/Taskbar.cpp
  win32/QueueFrame.cpp
  win32/UserInfoBase.cpp
  win32/WinUtil.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 'dwt/src/Taskbar.cpp'
--- dwt/src/Taskbar.cpp	2012-01-07 20:59:41 +0000
+++ dwt/src/Taskbar.cpp	2012-01-08 12:47:07 +0000
@@ -183,7 +183,7 @@
 		// generate a preview of the tab to be shown in "Aero Peek" when the user hovers the thumbnail.
 		BitmapPtr bitmap = getBitmap(tab, 0);
 		if(bitmap) {
-			POINT offset { 0 };
+			POINT offset = { 0 };
 			::MapWindowPoints(tab->handle(), window->handle(), &offset, 1);
 			MENUBARINFO info = { sizeof(MENUBARINFO) };
 			if(::GetMenuBarInfo(window->handle(), OBJID_MENU, 0, &info))

=== modified file 'win32/QueueFrame.cpp'
--- win32/QueueFrame.cpp	2012-01-07 18:30:38 +0000
+++ win32/QueueFrame.cpp	2012-01-08 12:47:07 +0000
@@ -661,11 +661,7 @@
 void QueueFrame::handleGetList(const HintedUser& user) {
 	if(files->countSelected() == 1) {
 		try {
-			int flags = QueueItem::FLAG_CLIENT_VIEW;
-			if(!user.user->isSet(User::NMDC)) {
-				flags |= QueueItem::FLAG_PARTIAL_LIST;
-			}
-			QueueManager::getInstance()->addList(user, flags);
+			QueueManager::getInstance()->addList(user, QueueItem::FLAG_CLIENT_VIEW | QueueItem::FLAG_PARTIAL_LIST);
 		} catch(const Exception&) {
 		}
 	}

=== modified file 'win32/UserInfoBase.cpp'
--- win32/UserInfoBase.cpp	2012-01-07 18:16:19 +0000
+++ win32/UserInfoBase.cpp	2012-01-08 12:47:07 +0000
@@ -42,11 +42,7 @@
 }
 void UserInfoBase::getList() {
 	try {
-		int flags = QueueItem::FLAG_CLIENT_VIEW;
-		if(!user.user->isSet(User::NMDC)) {
-			flags |= QueueItem::FLAG_PARTIAL_LIST;
-		}
-		QueueManager::getInstance()->addList(user, flags);
+		QueueManager::getInstance()->addList(user, QueueItem::FLAG_CLIENT_VIEW | QueueItem::FLAG_PARTIAL_LIST);
 	} catch(const Exception& e) {
 		LogManager::getInstance()->message(e.getError());
 	}

=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp	2012-01-07 20:25:42 +0000
+++ win32/WinUtil.cpp	2012-01-08 12:47:07 +0000
@@ -1282,7 +1282,7 @@
 			try {
 				UserPtr user = ClientManager::getInstance()->findLegacyUser(file);
 				if(user)
-					QueueManager::getInstance()->addList(HintedUser(user, url), QueueItem::FLAG_CLIENT_VIEW);
+					QueueManager::getInstance()->addList(HintedUser(user, url), QueueItem::FLAG_CLIENT_VIEW | QueueItem::FLAG_PARTIAL_LIST);
 				// @todo else report error
 			} catch (const Exception&) {
 				// ...
@@ -1426,11 +1426,7 @@
 	QueueManager* qm = QueueManager::getInstance();
 
 	addUsers(menu, T_("&Get file list"), users, [=](const HintedUser &u, const string& s) {
-		int flags = QueueItem::FLAG_CLIENT_VIEW;
-		if(!u.user->isSet(User::NMDC)) {
-			flags |= QueueItem::FLAG_PARTIAL_LIST;
-		}
-		qm->addList(u, flags, s); }, dwt::IconPtr(), dirs);
+		qm->addList(u, QueueItem::FLAG_CLIENT_VIEW | QueueItem::FLAG_PARTIAL_LIST, s); }, dwt::IconPtr(), dirs);
 
 	addUsers(menu, T_("&Match queue"), users, [=](const HintedUser &u, const string& s) {
 		qm->addList(u, QueueItem::FLAG_MATCH_QUEUE, Util::emptyString); });