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

Move from MR_EVENT_IS_ONLINE to MR_EVENT_IS_OFFLINE to allow passing 0 as the default parameter and keep the stuff running.

Browse source
This commit is contained in:
B. Petersen 2017-11-15 11:38:10 +01:00
parent 58833040f2
commit cc317f8ce4
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmdline/main.c
View file

@ -59,9 +59,6 @@ static uintptr_t receive_event(mrmailbox_t* mailbox, int event, uintptr_t data1,
case MR_EVENT_WAKE_LOCK: case MR_EVENT_WAKE_LOCK:
break; /* do not show the event as this would fill the screen */ break; /* do not show the event as this would fill the screen */
case MR_EVENT_IS_ONLINE:
return 1;
case MR_EVENT_INFO: case MR_EVENT_INFO:
printf("%s\n", (char*)data2); printf("%s\n", (char*)data2);
break; break;

15
src/mrevent.h
View file

@ -171,9 +171,18 @@ services. data1=file name, data2=mime type */
/* The following events are functions that should be provided by the frontends */ /* The following events are functions that should be provided by the frontends */
/** check, if the system is online currently /**
ret=0: not online, ret=1: online */ * Ask the frontend about the offline state.
#define MR_EVENT_IS_ONLINE 2080 * This function may be provided by the frontend. If we already know, that we're
* offline, eg. there is no need to try to connect and things will speed up.
*
* @param data1 0
*
* @param data2 0
*
* @return 0=online, 1=offline
*/
#define MR_EVENT_IS_OFFLINE 2081
/** get a string from the frontend, data1=MR_STR_*, ret=string which will be /** get a string from the frontend, data1=MR_STR_*, ret=string which will be

2
src/mrimap.c
View file

@ -1083,7 +1083,7 @@ static int setup_handle_if_needed__(mrimap_t* ths)
goto cleanup; goto cleanup;
} }
if( ths->m_mailbox->m_cb(ths->m_mailbox, MR_EVENT_IS_ONLINE, 0, 0)!=1 ) { if( ths->m_mailbox->m_cb(ths->m_mailbox, MR_EVENT_IS_OFFLINE, 0, 0)!=0 ) {
mrmailbox_log_error_if(&ths->m_log_connect_errors, ths->m_mailbox, MR_ERR_NONETWORK, NULL); mrmailbox_log_error_if(&ths->m_log_connect_errors, ths->m_mailbox, MR_ERR_NONETWORK, NULL);
goto cleanup; goto cleanup;
} }

2
src/mrmailbox_configure.c
View file

@ -384,7 +384,7 @@ static void* configure_thread_entry_point(void* entry_arg)
PROGRESS(0) PROGRESS(0)
if( mailbox->m_cb(mailbox, MR_EVENT_IS_ONLINE, 0, 0)!=1 ) { if( mailbox->m_cb(mailbox, MR_EVENT_IS_OFFLINE, 0, 0)!=0 ) {
mrmailbox_log_error(mailbox, MR_ERR_NONETWORK, NULL); mrmailbox_log_error(mailbox, MR_ERR_NONETWORK, NULL);
goto exit_; goto exit_;
} }

2
src/mrmailbox_log.c
View file

@ -171,7 +171,7 @@ void mrmailbox_log_error_if(int* condition, mrmailbox_t* mailbox, int code, cons
va_start(va, msg); va_start(va, msg);
if( *condition ) { if( *condition ) {
/* pop-up error, if we're offline, force a "not connected" error (the function is not used for other cases) */ /* pop-up error, if we're offline, force a "not connected" error (the function is not used for other cases) */
if( mailbox->m_cb(mailbox, MR_EVENT_IS_ONLINE, 0, 0)!=1 ) { if( mailbox->m_cb(mailbox, MR_EVENT_IS_OFFLINE, 0, 0)!=0 ) {
mrmailbox_log_vprintf(mailbox, MR_EVENT_ERROR, MR_ERR_NONETWORK, NULL, va); mrmailbox_log_vprintf(mailbox, MR_EVENT_ERROR, MR_ERR_NONETWORK, NULL, va);
} }
else { else {

2
src/mrsmtp.c
View file

@ -107,7 +107,7 @@ int mrsmtp_connect(mrsmtp_t* ths, const mrloginparam_t* lp)
LOCK_SMTP LOCK_SMTP
if( ths->m_mailbox->m_cb(ths->m_mailbox, MR_EVENT_IS_ONLINE, 0, 0)!=1 ) { if( ths->m_mailbox->m_cb(ths->m_mailbox, MR_EVENT_IS_OFFLINE, 0, 0)!=0 ) {
mrmailbox_log_error_if(&ths->m_log_connect_errors, ths->m_mailbox, MR_ERR_NONETWORK, NULL); mrmailbox_log_error_if(&ths->m_log_connect_errors, ths->m_mailbox, MR_ERR_NONETWORK, NULL);
goto cleanup; goto cleanup;
} }