linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2374
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-01-02 20:52:46 +0100
message:
  make sure self file lists always show up
modified:
  dcpp/ShareManager.cpp
  dcpp/ShareManager.h
  win32/DirectoryListingFrame.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/ShareManager.cpp'
--- dcpp/ShareManager.cpp	2011-01-02 17:12:02 +0000
+++ dcpp/ShareManager.cpp	2011-01-02 19:52:46 +0000
@@ -52,7 +52,7 @@
 namespace dcpp {
 
 ShareManager::ShareManager() : hits(0), xmlListLen(0), bzXmlListLen(0),
-	xmlDirty(true), forceXmlRefresh(false), refreshDirs(false), update(false), initial(true), listN(0), refreshing(false),
+	xmlDirty(true), forceXmlRefresh(true), refreshDirs(false), update(false), initial(true), listN(0), refreshing(false),
 	lastXmlUpdate(0), lastFullUpdate(GET_TICK()), bloom(1<<20)
 {
 	SettingsManager::getInstance()->addListener(this);

=== modified file 'dcpp/ShareManager.h'
--- dcpp/ShareManager.h	2011-01-02 17:12:02 +0000
+++ dcpp/ShareManager.h	2011-01-02 19:52:46 +0000
@@ -96,7 +96,7 @@
 		hits += aHits;
 	}
 
-	string getOwnListFile() {
+	const string& getOwnListFile() {
 		generateXmlList();
 		return getBZXmlFile();
 	}

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2011-01-02 17:12:02 +0000
+++ win32/DirectoryListingFrame.cpp	2011-01-02 19:52:46 +0000
@@ -102,7 +102,7 @@
 }
 
 void DirectoryListingFrame::openOwnList(dwt::TabView* parent) {
-	string ownListFile = ShareManager::getInstance()->getOwnListFile();
+	const string& ownListFile = ShareManager::getInstance()->getOwnListFile();
 	if(!ownListFile.empty()) {
 		openWindow(parent, Text::toT(ownListFile), Util::emptyStringT, HintedUser(ClientManager::getInstance()->getMe(), Util::emptyString), 0);
 	}
@@ -274,6 +274,7 @@
 	}
 
 	searchGrid->setEnabled(false);
+	searchGrid->setVisible(false);
 
 	initStatus();
 
@@ -377,11 +378,13 @@
 	if(searchGrid->getEnabled()) {
 		searchBox->clear();
 		searchGrid->setEnabled(false);
+		searchGrid->setVisible(false);
 		grid->row(1).mode = GridInfo::STATIC;
 	} else {
 		for(auto i = lastSearches.crbegin(), iend = lastSearches.crend(); i != iend; ++i)
 			searchBox->addValue(*i);
 		searchGrid->setEnabled(true);
+		searchGrid->setVisible(true);
 		grid->row(1).mode = GridInfo::AUTO;
 		searchBox->setFocus();
 	}