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
Improved importing support.
[xestiaab/.git]
/
source
/
import
/
import.cpp
diff --git
a/source/import/import.cpp
b/source/import/import.cpp
index
948f83f
..
b85c4f6
100644
(file)
--- a/
source/import/import.cpp
+++ b/
source/import/import.cpp
@@
-104,6
+104,18
@@
void ImportRun(frmMain *frmMainPtrInc){
AccountName = frmIC->GetAccount();
AccountType = frmIC->GetAccountType();
AccountName = frmIC->GetAccount();
AccountType = frmIC->GetAccountType();
+ if (frmIC->GetDialogResult() == FALSE){
+
+ // User decided not to import. Clean up the
+ // dialog.
+
+ delete frmIC;
+ frmIC = NULL;
+ frmMainPtrInc->ResumeAllTimers();
+ return;
+
+ }
+
delete frmIC;
frmIC = NULL;
delete frmIC;
frmIC = NULL;
@@
-289,10
+301,14
@@
void ImportRun(frmMain *frmMainPtrInc){
if (AccountType != wxT("Local") && AccountType != wxT("local")){
if (AccountType != wxT("Local") && AccountType != wxT("local")){
- wxString *AccNamePostEventPtr = new wxString;
+ wxString AccNamePostEvent;
+
+ AccNamePostEvent.Clear();
+ AccNamePostEvent.Append(AccountName);
+ AccNamePostEvent.Trim();
wxCommandEvent accevent(SYNCACCOUNT);
wxCommandEvent accevent(SYNCACCOUNT);
- accevent.Set
ClientData(AccNamePostEventPtr
);
+ accevent.Set
String(AccNamePostEvent
);
wxPostEvent(frmMainPtrInc, accevent);
wxPostEvent(frmMainPtrInc, accevent);
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy