yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #173 from t-oster/feature-fix-subfolder

Browse source 
Use INBOX.Chats as fallback if Chats can't be created
This commit is contained in:
Björn Petersen 2018-06-03 12:40:34 +02:00 • committed by GitHub
commit 2dccf1f6c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/mrchat-private.h
View file

@ -62,6 +62,7 @@ int mrchat_are_all_members_verified__ (mrchat_t*);
#define MR_CHAT_PREFIX "Chat:" /* you MUST NOT modify this or the following strings */ #define MR_CHAT_PREFIX "Chat:" /* you MUST NOT modify this or the following strings */
#define MR_CHATS_FOLDER "Chats" /* if we want to support Gma'l-labels - "Chats" is a reserved word for Gma'l */ #define MR_CHATS_FOLDER "Chats" /* if we want to support Gma'l-labels - "Chats" is a reserved word for Gma'l */
#define MR_CHATS_FOLDER_FALLBACK "INBOX.Chats"/* This is used if the toplevel folder can't be created (e.g DomainFactory) */
#ifdef __cplusplus #ifdef __cplusplus

14
src/mrimap.c
View file

@ -316,7 +316,7 @@ static int init_chat_folders__(mrimap_t* ths)
folder_list = list_folders__(ths); folder_list = list_folders__(ths);
for( iter1 = clist_begin(folder_list); iter1 != NULL ; iter1 = clist_next(iter1) ) { for( iter1 = clist_begin(folder_list); iter1 != NULL ; iter1 = clist_next(iter1) ) {
mrimapfolder_t* folder = (struct mrimapfolder_t*)clist_content(iter1); mrimapfolder_t* folder = (struct mrimapfolder_t*)clist_content(iter1);
if( strcmp(folder->m_name_utf8, MR_CHATS_FOLDER)==0 ) { if( strcmp(folder->m_name_utf8, MR_CHATS_FOLDER)==0 || strcmp(folder->m_name_utf8, MR_CHATS_FOLDER_FALLBACK)==0 ) {
chats_folder = safe_strdup(folder->m_name_to_select); chats_folder = safe_strdup(folder->m_name_to_select);
break; break;
} }
@ -332,8 +332,16 @@ static int init_chat_folders__(mrimap_t* ths)
mrmailbox_log_info(ths->m_mailbox, 0, "Creating IMAP-folder \"%s\"...", MR_CHATS_FOLDER); mrmailbox_log_info(ths->m_mailbox, 0, "Creating IMAP-folder \"%s\"...", MR_CHATS_FOLDER);
int r = mailimap_create(ths->m_hEtpan, MR_CHATS_FOLDER); int r = mailimap_create(ths->m_hEtpan, MR_CHATS_FOLDER);
if( is_error(ths, r) ) { if( is_error(ths, r) ) {
/* continue on errors, we'll just use a different folder then */ mrmailbox_log_warning(ths->m_mailbox, 0, "Cannot create IMAP-folder, using trying INBOX subfolder.");
mrmailbox_log_warning(ths->m_mailbox, 0, "Cannot create IMAP-folder, using default."); r = mailimap_create(ths->m_hEtpan, MR_CHATS_FOLDER_FALLBACK);
if( is_error(ths, r) ) {
/* continue on errors, we'll just use a different folder then */
mrmailbox_log_warning(ths->m_mailbox, 0, "Cannot create IMAP-folder, using default.");
}
else {
chats_folder = safe_strdup(MR_CHATS_FOLDER_FALLBACK);
mrmailbox_log_info(ths->m_mailbox, 0, "IMAP-folder created (inbox subfolder).");
}
} }
else { else {
chats_folder = safe_strdup(MR_CHATS_FOLDER); chats_folder = safe_strdup(MR_CHATS_FOLDER);