o2on svn commit
o2on-****@lists*****
2008年 4月 23日 (水) 12:10:57 JST
Revision: 80
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=80
Author: electrolysis
Date: 2008-04-23 12:10:57 +0900 (Wed, 23 Apr 2008)
Log Message:
-----------
FIX: 補完時ã®ãƒãƒ«ãƒ¼ãƒ³ã‚’OFFã«ã—ã¦ã‚‚ãƒãƒ«ãƒ¼ãƒ³ãŒè¡¨ç¤ºã•ã‚Œã‚‹
Modified Paths:
--------------
branches/BRANCH_0043/o2on/src.o2on/O2Job_DatCollector.h
branches/BRANCH_0043/o2on/src.o2on/O2Job_QueryDat.h
branches/BRANCH_0043/o2on/src.o2on/O2Protocol_Dat.h
branches/BRANCH_0043/o2on/src.o2on/O2Server_HTTP_P2P.h
Modified: branches/BRANCH_0043/o2on/src.o2on/O2Job_DatCollector.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2Job_DatCollector.h 2008-04-23 02:36:37 UTC (rev 79)
+++ branches/BRANCH_0043/o2on/src.o2on/O2Job_DatCollector.h 2008-04-23 03:10:57 UTC (rev 80)
@@ -112,7 +112,7 @@
// –{•¶‚ÌdatŽæ‚èž‚Ý
const char *rawdata = &ss.rbuff[header->length];
uint64 datsize = ss.rbuff.size() - header->length;
- imported = ImportDat(DatIO, Boards, *header, rawdata, datsize,
+ imported = ImportDat(DatIO, Profile, Boards, *header, rawdata, datsize,
Logger, ss.ip, ss.port, QueryDB, hwndBaloonCallback, msgBaloonCallback);
//1ŒÂ¬Œ÷‚µ‚½‚çI‚í‚è
}
Modified: branches/BRANCH_0043/o2on/src.o2on/O2Job_QueryDat.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2Job_QueryDat.h 2008-04-23 02:36:37 UTC (rev 79)
+++ branches/BRANCH_0043/o2on/src.o2on/O2Job_QueryDat.h 2008-04-23 03:10:57 UTC (rev 80)
@@ -130,7 +130,7 @@
const char *rawdata = &ss.rbuff[header->length];
uint64 datsize = ss.rbuff.size() - header->length;
- ImportDat(DatIO, NULL, *header, rawdata, datsize,
+ ImportDat(DatIO, Profile, NULL, *header, rawdata, datsize,
Logger, ss.ip, ss.port, QueryDB, hwndBaloonCallback, msgBaloonCallback);
}
Modified: branches/BRANCH_0043/o2on/src.o2on/O2Protocol_Dat.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2Protocol_Dat.h 2008-04-23 02:36:37 UTC (rev 79)
+++ branches/BRANCH_0043/o2on/src.o2on/O2Protocol_Dat.h 2008-04-23 03:10:57 UTC (rev 80)
@@ -160,6 +160,7 @@
// ImportDat
// -----------------------------------------------------------------------
bool ImportDat(O2DatIO *datio
+ , const O2Profile *profile
, O2Boards *boards
, const HTTPHeader &header
, const char *rawdata
@@ -230,7 +231,7 @@
datpath.gethash(hash);
wstring title;
datpath.gettitle(title);
- if (QueryDB->SetNote(hash, title.c_str(), size)) {
+ if (QueryDB->SetNote(hash, title.c_str(), size) && hwndBaloonCallback && profile->IsBaloon_Hokan()) {
wchar_t msg[256];
swprintf_s(msg, 256, L"%s\n‚ª•âŠ®‚³‚ê‚Ü‚µ‚½", title.c_str());
SendMessage(
Modified: branches/BRANCH_0043/o2on/src.o2on/O2Server_HTTP_P2P.h
===================================================================
--- branches/BRANCH_0043/o2on/src.o2on/O2Server_HTTP_P2P.h 2008-04-23 02:36:37 UTC (rev 79)
+++ branches/BRANCH_0043/o2on/src.o2on/O2Server_HTTP_P2P.h 2008-04-23 03:10:57 UTC (rev 80)
@@ -337,7 +337,7 @@
if (hdr->contentlength) {
dat = &ss->rbuff[hdr->length];
datsize = ss->rbuff.size() - hdr->length;
- bool imported = ImportDat(DatIO, Boards, *hdr, dat, datsize,
+ bool imported = ImportDat(DatIO, Profile, Boards, *hdr, dat, datsize,
Logger, node.ip, node.port, QueryDB, hwndBaloonCallback, msgBaloonCallback);
if (!imported) {
ss->Lock();