yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 02:29:28 +02:00
Code Issues Releases Wiki Activity

do not start a thread for the import-/export process.

Browse source
This commit is contained in:
B. Petersen 2017-11-30 23:10:27 +01:00
parent d70a6393a8
commit 7ae34daa03
5 changed files with 124 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmdline/cmdline.c
View file

@ -437,23 +437,19 @@ char* mrmailbox_cmdline(mrmailbox_t* mailbox, const char* cmdline)
if( arg2 ) { *arg2 = 0; arg2++; }
if( strcmp(arg1, "export-keys")==0 && arg2==NULL ) {
mrmailbox_imex(mailbox, MR_IMEX_EXPORT_SELF_KEYS, mailbox->m_blobdir, NULL);
ret = COMMAND_SUCCEEDED;
ret = mrmailbox_imex(mailbox, MR_IMEX_EXPORT_SELF_KEYS, mailbox->m_blobdir, NULL)? COMMAND_SUCCEEDED : COMMAND_FAILED;
}
else if( strcmp(arg1, "import-keys")==0 ) {
mrmailbox_imex(mailbox, MR_IMEX_IMPORT_SELF_KEYS, mailbox->m_blobdir, NULL);
ret = COMMAND_SUCCEEDED;
ret = mrmailbox_imex(mailbox, MR_IMEX_IMPORT_SELF_KEYS, mailbox->m_blobdir, NULL)? COMMAND_SUCCEEDED : COMMAND_FAILED;
}
else if( strcmp(arg1, "export-backup")==0 && arg2==NULL ) {
mrmailbox_imex(mailbox, MR_IMEX_EXPORT_BACKUP, mailbox->m_blobdir, NULL);
ret = COMMAND_SUCCEEDED;
ret = mrmailbox_imex(mailbox, MR_IMEX_EXPORT_BACKUP, mailbox->m_blobdir, NULL)? COMMAND_SUCCEEDED : COMMAND_FAILED;
}
else if( strcmp(arg1, "import-backup")==0 && arg2!=NULL ) {
mrmailbox_imex(mailbox, MR_IMEX_IMPORT_BACKUP, arg2, NULL);
ret = COMMAND_SUCCEEDED;
ret = mrmailbox_imex(mailbox, MR_IMEX_IMPORT_BACKUP, arg2, NULL)? COMMAND_SUCCEEDED : COMMAND_FAILED;
}
else if( strcmp(arg1, "cancel")==0 ) {
mrmailbox_imex(mailbox, 0, NULL, NULL);
mrmailbox_imex_cancel(mailbox);
ret = COMMAND_SUCCEEDED;
}
else {