Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frmContactEditor: Check if there is values in certain text boxes
[xestiaab/.git]
/
source
/
common
/
etag.cpp
diff --git
a/source/common/etag.cpp
b/source/common/etag.cpp
index
6e24d01
..
a2d298d
100644
(file)
--- a/
source/common/etag.cpp
+++ b/
source/common/etag.cpp
@@
-180,9
+180,7
@@
wxString ETagDB::GetETag(wxString Filename){
ProcessLock->lock();
// Get the ETag.
ProcessLock->lock();
// Get the ETag.
-
- //IterwxS = FilenameETag.find(Filename);
-
+
if (FilenameETag.find(Filename) != FilenameETag.end()){
IterwxS = FilenameETag.find(Filename);
if (FilenameETag.find(Filename) != FilenameETag.end()){
IterwxS = FilenameETag.find(Filename);
@@
-212,8
+210,6
@@
wxString ETagDB::GetETagOriginal(wxString Filename){
// Get the ETag.
// Get the ETag.
- //IterwxS = FilenameETag.find(Filename);
-
if (FilenameETagOriginal.find(Filename) != FilenameETagOriginal.end()){
IterwxS = FilenameETagOriginal.find(Filename);
if (FilenameETagOriginal.find(Filename) != FilenameETagOriginal.end()){
IterwxS = FilenameETagOriginal.find(Filename);
@@
-270,7
+266,7
@@
bool ETagDB::WriteETagDB(){
if (wxFileExists(AccountETagDB) == FALSE){
if (ETagDBFile.Create(AccountETagDB) == FALSE){
if (wxFileExists(AccountETagDB) == FALSE){
if (ETagDBFile.Create(AccountETagDB) == FALSE){
- ////ProcessLock.unlock();
+
return FALSE;
}
return FALSE;
}
@@
-278,7
+274,7
@@
bool ETagDB::WriteETagDB(){
} else {
if (ETagDBFile.Open(AccountETagDB) == FALSE){
} else {
if (ETagDBFile.Open(AccountETagDB) == FALSE){
- ////ProcessLock.unlock();
+
return FALSE;
}
return FALSE;
}
@@
-298,7
+294,19
@@
bool ETagDB::WriteETagDB(){
continue;
}
continue;
}
- SettingLine = iter->first + wxT("|") + iter->second + wxT("|") + IterwxS->second;
+ wxString ServerETag = "";
+
+ if (IterwxS == FilenameETagOriginal.end()) {
+
+ ServerETag = "";
+
+ } else {
+
+ ServerETag = IterwxS->second;
+
+ }
+
+ SettingLine = iter->first + wxT("|") + iter->second + wxT("|") + ServerETag;
ETagDBFile.InsertLine(SettingLine, LineSeek);
ETagDBFile.InsertLine(SettingLine, LineSeek);
@@
-332,9
+340,7
@@
bool ETagDB::LoadETagDB(){
wxString AccountDirPath;
#if defined(__HAIKU__)
wxString AccountDirPath;
#if defined(__HAIKU__)
-
- //preffilename = wxT("noo");
-
+
#elif defined(__WIN32__)
AccountDirPath = GetAccountDir(AccountDir, FALSE);
#elif defined(__WIN32__)
AccountDirPath = GetAccountDir(AccountDir, FALSE);
@@
-356,8
+362,6
@@
bool ETagDB::LoadETagDB(){
if (wxFileExists(AccountETagDB) == FALSE){
if (ETagDBFile.Create(AccountETagDB) == FALSE){
if (wxFileExists(AccountETagDB) == FALSE){
if (ETagDBFile.Create(AccountETagDB) == FALSE){
- ////ProcessLock.unlock();
- //ProcessLock->unlock();
return FALSE;
return FALSE;
@@
-367,8
+371,6
@@
bool ETagDB::LoadETagDB(){
if (ETagDBFile.Open(AccountETagDB, wxConvUTF8) == FALSE){
if (ETagDBFile.Open(AccountETagDB, wxConvUTF8) == FALSE){
- ////ProcessLock.unlock();
- //ProcessLock->unlock();
return FALSE;
}
return FALSE;
}
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy