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

use the new prefix for the new functions

Browse source
This commit is contained in:
B. Petersen 2018-06-20 11:08:04 +02:00
parent 57fbad5510
commit c13366b234
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmdline/main.c
View file

@ -134,10 +134,10 @@ static void* imap_thread_entry_point (void* entry_arg)
while( 1 ) {
// perform_jobs(), fetch() and idle()
// MUST be called from the same single thread and MUST be called sequentially.
mrmailbox_perform_jobs(mailbox);
mrmailbox_fetch(mailbox);
dc_perform_imap_jobs(mailbox);
dc_perform_imap_fetch(mailbox);
if( imap_foreground ) {
mrmailbox_idle(mailbox); // this may take hours ...
dc_perform_imap_idle(mailbox); // this may take hours ...
}
else {
break;
@ -155,9 +155,9 @@ static void* smtp_thread_entry_point (void* entry_arg)
mrmailbox_t* mailbox = (mrmailbox_t*)entry_arg;
while( 1 ) {
mrmailbox_perform_smtp_jobs(mailbox);
dc_perform_smtp_jobs(mailbox);
if( imap_foreground ) {
mrmailbox_perform_smtp_idle(mailbox); // this may take hours ...
dc_perform_smtp_idle(mailbox); // this may take hours ...
}
else {
break;
@ -184,8 +184,8 @@ static void start_threads(mrmailbox_t* mailbox)
static void stop_threads(mrmailbox_t* mailbox)
{
imap_foreground = 0;
mrmailbox_interrupt_idle(mailbox);
mrmailbox_interrupt_smtp_idle(mailbox);
dc_interrupt_imap_idle(mailbox);
dc_interrupt_smtp_idle(mailbox);
}

18
src/mrjob.c
View file

@ -537,10 +537,10 @@ void mrjob_add(mrmailbox_t* mailbox, int action, int foreign_id, const char* par
sqlite3_finalize(stmt);
if( thread == MR_IMAP_THREAD ) {
mrmailbox_interrupt_idle(mailbox);
dc_interrupt_imap_idle(mailbox);
}
else {
mrmailbox_interrupt_smtp_idle(mailbox);
dc_interrupt_smtp_idle(mailbox);
}
}
@ -662,7 +662,7 @@ cleanup:
* @param mailbox The mailbox object.
* @return None
*/
void mrmailbox_perform_jobs(mrmailbox_t* mailbox)
void dc_perform_imap_jobs(mrmailbox_t* mailbox)
{
mrmailbox_log_info(mailbox, 0, "IMAP-jobs started...");
@ -683,7 +683,7 @@ void mrmailbox_perform_jobs(mrmailbox_t* mailbox)
* @param mailbox The mailbox object.
* @return None.
*/
void mrmailbox_fetch(mrmailbox_t* mailbox)
void dc_perform_imap_fetch(mrmailbox_t* mailbox)
{
clock_t start = clock();
@ -713,7 +713,7 @@ void mrmailbox_fetch(mrmailbox_t* mailbox)
* @param mailbox The mailbox object.
* @return None.
*/
void mrmailbox_idle(mrmailbox_t* mailbox)
void dc_perform_imap_idle(mrmailbox_t* mailbox)
{
connect_to_imap(mailbox, NULL); // also idle if connection fails because of not-configured, no-network, whatever. mrimap_idle() will handle this by the fake-idle and log a warning
@ -740,7 +740,7 @@ void mrmailbox_idle(mrmailbox_t* mailbox)
* @param mailbox The mailbox object.
* @return None
*/
void mrmailbox_interrupt_idle(mrmailbox_t* mailbox)
void dc_interrupt_imap_idle(mrmailbox_t* mailbox)
{
if( mailbox == NULL || mailbox->m_magic != MR_MAILBOX_MAGIC || mailbox->m_imap == NULL ) {
mrmailbox_log_warning(mailbox, 0, "Interrupt IMAP-IDLE: Bad parameters.");
@ -765,7 +765,7 @@ void mrmailbox_interrupt_idle(mrmailbox_t* mailbox)
******************************************************************************/
void mrmailbox_perform_smtp_jobs(mrmailbox_t* mailbox)
void dc_perform_smtp_jobs(mrmailbox_t* mailbox)
{
mrmailbox_log_info(mailbox, 0, "SMTP-jobs started...");
@ -779,7 +779,7 @@ void mrmailbox_perform_smtp_jobs(mrmailbox_t* mailbox)
}
void mrmailbox_perform_smtp_idle(mrmailbox_t* mailbox)
void dc_perform_smtp_idle(mrmailbox_t* mailbox)
{
if( mailbox == NULL || mailbox->m_magic != MR_MAILBOX_MAGIC ) {
mrmailbox_log_warning(mailbox, 0, "Cannot perform SMTP-idle: Bad parameters.");
@ -816,7 +816,7 @@ void mrmailbox_perform_smtp_idle(mrmailbox_t* mailbox)
}
void mrmailbox_interrupt_smtp_idle(mrmailbox_t* mailbox)
void dc_interrupt_smtp_idle(mrmailbox_t* mailbox)
{
if( mailbox == NULL || mailbox->m_magic != MR_MAILBOX_MAGIC ) {
mrmailbox_log_warning(mailbox, 0, "Interrupt SMTP-idle: Bad parameters.");

14
src/mrmailbox.h
View file

@ -213,14 +213,14 @@ char* mrmailbox_get_info (mrmailbox_t*);
void mrmailbox_configure (mrmailbox_t*);
int mrmailbox_is_configured (mrmailbox_t*);
void mrmailbox_perform_jobs (mrmailbox_t*);
void mrmailbox_fetch (mrmailbox_t*);
void mrmailbox_idle (mrmailbox_t*);
void mrmailbox_interrupt_idle (mrmailbox_t*);
void dc_perform_imap_jobs (mrmailbox_t*);
void dc_perform_imap_fetch (mrmailbox_t*);
void dc_perform_imap_idle (mrmailbox_t*);
void dc_interrupt_imap_idle (mrmailbox_t*);
void mrmailbox_perform_smtp_jobs (mrmailbox_t*);
void mrmailbox_perform_smtp_idle (mrmailbox_t*);
void mrmailbox_interrupt_smtp_idle(mrmailbox_t*);
void dc_perform_smtp_jobs (mrmailbox_t*);
void dc_perform_smtp_idle (mrmailbox_t*);
void dc_interrupt_smtp_idle (mrmailbox_t*);
void mrmailbox_stop_ongoing_process(mrmailbox_t*);