Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9aa5e66
)
Removed commented out lines from ConflictResolution in frmMain
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Mon, 30 Nov 2015 13:09:02 +0000
(13:09 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Mon, 30 Nov 2015 13:09:02 +0000
(13:09 +0000)
source/frmMain.cpp
patch
|
blob
|
history
diff --git
a/source/frmMain.cpp
b/source/frmMain.cpp
index
1237b82
..
fcb9952
100644
(file)
--- a/
source/frmMain.cpp
+++ b/
source/frmMain.cpp
@@
-1586,11
+1586,7
@@
void frmMain::ConflictResolution(wxCommandEvent& event){
vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
vCard *ServerDataPtr = vCardConfObj->vCardServerData;
vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
vCard *ServerDataPtr = vCardConfObj->vCardServerData;
- //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
- //wxString Moo = ClientDataPtr->WriteString();
- //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
- //frameCR->LoadData(vCardConfObj->vCardLocalData, vCardConfObj->vCardServerData, &MemoryFileList);
frameCR->ShowModal();
int FinalConflictResult = frameCR->GetResult();
frameCR->ShowModal();
int FinalConflictResult = frameCR->GetResult();
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy