projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.29
[fms.git]
/
src
/
freenet
/
inactivemessagelistrequester.cpp
diff --git
a/src/freenet/inactivemessagelistrequester.cpp
b/src/freenet/inactivemessagelistrequester.cpp
index
7cbfbe8
..
a0a0277
100644
(file)
--- a/
src/freenet/inactivemessagelistrequester.cpp
+++ b/
src/freenet/inactivemessagelistrequester.cpp
@@
-6,12
+6,12
@@
#include <xmem.h>
\r
#endif
\r
\r
#include <xmem.h>
\r
#endif
\r
\r
-InactiveMessageListRequester::InactiveMessageListRequester()
\r
+InactiveMessageListRequester::InactiveMessageListRequester(
SQLite3DB::DB *db):MessageListRequester(db
)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-InactiveMessageListRequester::InactiveMessageListRequester(
FCPv2 *fcp):MessageListRequester(
fcp)
\r
+InactiveMessageListRequester::InactiveMessageListRequester(
SQLite3DB::DB *db, FCPv2::Connection *fcp):MessageListRequester(db,
fcp)
\r
{
\r
Initialize();
\r
}
\r
{
\r
Initialize();
\r
}
\r
@@
-22,10
+22,11
@@
void InactiveMessageListRequester::Initialize()
std::string tempval="";
\r
\r
m_maxrequests=0;
\r
std::string tempval="";
\r
\r
m_maxrequests=0;
\r
- Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);
\r
+ Option option(m_db);
\r
+ option.GetInt("MaxMessageListRequests",m_maxrequests);
\r
\r
// inactive identities get 1/2 of the max requests option - active identities get 1/2 + any remaining if not evenly divisible
\r
\r
// inactive identities get 1/2 of the max requests option - active identities get 1/2 + any remaining if not evenly divisible
\r
- m_maxrequests=(m_maxrequests/2)
+(m_maxrequests%2)
;
\r
+ m_maxrequests=(m_maxrequests/2);
\r
\r
if(m_maxrequests<1)
\r
{
\r
\r
if(m_maxrequests<1)
\r
{
\r
@@
-38,7
+39,7
@@
void InactiveMessageListRequester::Initialize()
}
\r
\r
tempval="";
\r
}
\r
\r
tempval="";
\r
-
Option::Instance()->
Get("LocalTrustOverridesPeerTrust",tempval);
\r
+
option.
Get("LocalTrustOverridesPeerTrust",tempval);
\r
if(tempval=="true")
\r
{
\r
m_localtrustoverrides=true;
\r
if(tempval=="true")
\r
{
\r
m_localtrustoverrides=true;
\r
@@
-49,7
+50,7
@@
void InactiveMessageListRequester::Initialize()
}
\r
\r
tempval="";
\r
}
\r
\r
tempval="";
\r
-
Option::Instance()->
Get("SaveMessagesFromNewBoards",tempval);
\r
+
option.
Get("SaveMessagesFromNewBoards",tempval);
\r
if(tempval=="true")
\r
{
\r
m_savetonewboards=true;
\r
if(tempval=="true")
\r
{
\r
m_savetonewboards=true;
\r
@@
-61,7
+62,7
@@
void InactiveMessageListRequester::Initialize()
\r
m_messagedownloadmaxdaysbackward=5;
\r
tempval="5";
\r
\r
m_messagedownloadmaxdaysbackward=5;
\r
tempval="5";
\r
-
Option::Instance()->
Get("MessageDownloadMaxDaysBackward",tempval);
\r
+
option.
Get("MessageDownloadMaxDaysBackward",tempval);
\r
StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);
\r
\r
}
\r
StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);
\r
\r
}
\r