#include "imap-thread.h"
#include "account.h"
#include "tags.h"
+#include "main.h"
typedef struct _IMAPFolder IMAPFolder;
typedef struct _IMAPSession IMAPSession;
#define IMAPBUFSIZE 8192
-typedef enum
-{
- IMAP_FLAG_SEEN = 1 << 0,
- IMAP_FLAG_ANSWERED = 1 << 1,
- IMAP_FLAG_FLAGGED = 1 << 2,
- IMAP_FLAG_DELETED = 1 << 3,
- IMAP_FLAG_DRAFT = 1 << 4
-} IMAPFlags;
-
#define IMAP_IS_SEEN(flags) ((flags & IMAP_FLAG_SEEN) != 0)
#define IMAP_IS_ANSWERED(flags) ((flags & IMAP_FLAG_ANSWERED) != 0)
#define IMAP_IS_FLAGGED(flags) ((flags & IMAP_FLAG_FLAGGED) != 0)
#define IMAP_IS_DELETED(flags) ((flags & IMAP_FLAG_DELETED) != 0)
#define IMAP_IS_DRAFT(flags) ((flags & IMAP_FLAG_DRAFT) != 0)
+#define IMAP_IS_FORWARDED(flags) ((flags & IMAP_FLAG_FORWARDED) != 0)
#define IMAP4_PORT 143
GHashTable *tags_set_table;
GHashTable *tags_unset_table;
+ GSList *ok_flags;
};
FolderItem *item,
gboolean batch);
static gint imap_set_message_flags (IMAPSession *session,
+ IMAPFolderItem *item,
MsgNumberList *numlist,
IMAPFlags flags,
GSList *tags,
gint *unseen,
guint32 *uid_validity,
gint *can_create_flags,
+ GSList **ok_flags,
gboolean block);
static gint imap_cmd_close (IMAPSession *session);
static gint imap_cmd_examine (IMAPSession *session,
gboolean headers,
gboolean body);
static gint imap_cmd_append (IMAPSession *session,
+ IMAPFolderItem *item,
const gchar *destfolder,
const gchar *file,
IMAPFlags flags,
struct mailimap_set ** source,
struct mailimap_set ** dest);
static gint imap_cmd_store (IMAPSession *session,
+ IMAPFolderItem *item,
struct mailimap_set * set,
IMAPFlags flags,
GSList *tags,
static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info,
FolderItem *item);
static void imap_lep_set_free(GSList *seq_list);
-static struct mailimap_flag_list * imap_flag_to_lep(IMAPFlags flags, GSList *tags);
+static struct mailimap_flag_list * imap_flag_to_lep(IMAPFolderItem *item, IMAPFlags flags, GSList *tags);
typedef struct _hashtable_data {
GSList *msglist;
case IMAP_AUTH_CRAM_MD5:
ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
break;
+ case IMAP_AUTH_DIGEST_MD5:
+ ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
+ break;
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
debug_print("capabilities:\n"
"\t ANONYMOUS %d\n"
"\t CRAM-MD5 %d\n"
+ "\t DIGEST-MD5 %d\n"
"\t LOGIN %d\n"
"\t GSSAPI %d\n",
imap_has_capability(session, "ANONYMOUS"),
imap_has_capability(session, "CRAM-MD5"),
+ imap_has_capability(session, "DIGEST-MD5"),
imap_has_capability(session, "LOGIN"),
imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-MD5"))
ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
+ if ((ok == MAILIMAP_ERROR_BAD_STATE ||
+ ok == MAILIMAP_ERROR_LOGIN) && imap_has_capability(session, "DIGEST-MD5"))
+ ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
if ((ok == MAILIMAP_ERROR_BAD_STATE ||
ok == MAILIMAP_ERROR_LOGIN) && imap_has_capability(session, "GSSAPI"))
ok = imap_cmd_login(session, user, pass, "GSSAPI");
"CRAM-MD5 SASL plugin is installed.");
}
+ if (type == IMAP_AUTH_DIGEST_MD5) {
+ ext_info = _("\n\nDIGEST-MD5 logins only work if libetpan has been "
+ "compiled with SASL support and the "
+ "DIGEST-MD5 SASL plugin is installed.");
+ }
+
if (time(NULL) - last_login_err > 10) {
if (!prefs_common.no_recv_err_panel) {
alertpanel_error(_("Connection to %s failed: "
debug_print("disconnected!\n");
if (!is_fatal(r))
session = imap_reconnect_if_possible(folder, session);
- else
+ else {
+ rfolder->session = NULL;
+ rfolder->connecting = FALSE;
session = imap_session_get(folder);
+ }
}
if (session)
session->cancelled = FALSE;
imap_init(folder);
statuswindow_print_all(_("Connecting to IMAP4 server: %s..."), folder->account->recv_server);
+#ifndef G_OS_WIN32
if (account->set_tunnelcmd) {
r = imap_threaded_connect_cmd(folder,
account->tunnelcmd,
account->recv_server,
port);
}
- else {
+ else
+#endif
+ {
#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
if (ssl_type == SSL_TUNNEL) {
r = imap_threaded_connect_ssl(folder,
list_set = g_slist_prepend(list_set, g_strdup(str));
}
if (list_set) {
- ok = imap_set_message_flags(session, &numlist, 0, list_set, TRUE);
+ ok = imap_set_message_flags(session,
+ IMAP_FOLDER_ITEM(item), &numlist, 0, list_set, TRUE);
slist_free_strings(list_set);
g_slist_free(list_set);
if (ok != MAILIMAP_NO_ERROR) {
list_unset = g_slist_prepend(list_unset, g_strdup(str));
}
if (list_unset) {
- ok = imap_set_message_flags(session, &numlist, 0, list_unset, FALSE);
+ ok = imap_set_message_flags(session,
+ IMAP_FOLDER_ITEM(item), &numlist, 0, list_unset, FALSE);
slist_free_strings(list_unset);
g_slist_free(list_unset);
if (ok != MAILIMAP_NO_ERROR) {
iflags |= IMAP_FLAG_FLAGGED;
if (MSG_IS_REPLIED(*fileinfo->flags))
iflags |= IMAP_FLAG_ANSWERED;
+ if (MSG_IS_FORWARDED(*fileinfo->flags))
+ iflags |= IMAP_FLAG_FORWARDED;
if (!MSG_IS_UNREAD(*fileinfo->flags))
iflags |= IMAP_FLAG_SEEN;
+
}
if (real_file == NULL)
folder_has_parent_of_type(dest, F_TRASH))
iflags |= IMAP_FLAG_SEEN;
- ok = imap_cmd_append(session, destdir, real_file, iflags,
+ ok = imap_cmd_append(session, IMAP_FOLDER_ITEM(dest), destdir, real_file, iflags,
&new_uid);
if (ok != MAILIMAP_NO_ERROR) {
if (numlist != NULL) {
ok = imap_set_message_flags
- (session, numlist, IMAP_FLAG_DELETED, NULL, TRUE);
+ (session, IMAP_FOLDER_ITEM(msginfo->folder), numlist, IMAP_FLAG_DELETED, NULL, TRUE);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't set deleted flags\n"));
return ok;
GSList *newlist = NULL;
GSList *llast = NULL;
GSList *seq_list, *cur;
- gboolean got_alien_tags;
+ gboolean got_alien_tags = FALSE;
debug_print("uncached_messages\n");
gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);
gint id = 0;
id = tags_get_id_for_str(real_tag);
+ printf("tag %s %d\n", real_tag, id);
if (id == -1) {
id = tags_add_tag(real_tag);
got_alien_tags = TRUE;
}
static gint imap_set_message_flags(IMAPSession *session,
+ IMAPFolderItem *item,
MsgNumberList *numlist,
IMAPFlags flags,
GSList *tags,
statusbar_progress_all(set_item->set_first, total, 1);
- ok = imap_cmd_store(session, imapset,
+ ok = imap_cmd_store(session, item, imapset,
flags, tags, is_set);
statusbar_progress_all(set_item->set_last, total, 1);
if (ok != MAILIMAP_NO_ERROR && folder->max_set_size > 20) {
real_path = imap_get_real_path(session, folder, path);
+ g_slist_free(IMAP_FOLDER_ITEM(item)->ok_flags);
+ IMAP_FOLDER_ITEM(item)->ok_flags = NULL;
ok = imap_cmd_select(session, real_path,
- exists, recent, unseen, uid_validity, can_create_flags, block);
+ exists, recent, unseen, uid_validity, can_create_flags,
+ &(IMAP_FOLDER_ITEM(item)->ok_flags), block);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't select folder: %s\n"), real_path);
} else {
static gint imap_cmd_select(IMAPSession *session, const gchar *folder,
gint *exists, gint *recent, gint *unseen,
guint32 *uid_validity, gint *can_create_flags,
- gboolean block)
+ GSList **ok_flags, gboolean block)
{
int r;
r = imap_threaded_select(session->folder, folder,
- exists, recent, unseen, uid_validity, can_create_flags);
+ exists, recent, unseen, uid_validity, can_create_flags, ok_flags);
if (r != MAILIMAP_NO_ERROR) {
imap_handle_error(SESSION(session), r);
debug_print("select err %d\n", r);
}
-static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
+static gint imap_cmd_append(IMAPSession *session,
+ IMAPFolderItem *item,
+ const gchar *destfolder,
const gchar *file, IMAPFlags flags,
guint32 *new_uid)
{
g_return_val_if_fail(file != NULL, MAILIMAP_ERROR_BAD_STATE);
- flag_list = imap_flag_to_lep(flags, NULL);
+ flag_list = imap_flag_to_lep(item, flags, NULL);
lock_session(session);
r = imap_threaded_append(session->folder, destfolder,
file, flag_list, (int *)new_uid);
return MAILIMAP_NO_ERROR;
}
-static gint imap_cmd_store(IMAPSession *session, struct mailimap_set * set,
+static gint imap_cmd_store(IMAPSession *session,
+ IMAPFolderItem *item,
+ struct mailimap_set * set,
IMAPFlags flags, GSList *tags, int do_add)
{
int r;
struct mailimap_flag_list * flag_list = NULL;
struct mailimap_store_att_flags * store_att_flags;
- flag_list = imap_flag_to_lep(flags, tags);
+ flag_list = imap_flag_to_lep(item, flags, tags);
if (do_add)
store_att_flags =
uidlist = g_slist_concat(fetchuid_list, uidlist);
} else {
carray * lep_uidtab;
- if (r != -1) /* inited */
+ if (r != -1) { /* inited */
imap_handle_error(SESSION(session), r);
+ if (is_fatal(r))
+ return -1;
+ }
r = imap_threaded_fetch_uid(folder, 1,
&lep_uidtab);
if (r == MAILIMAP_NO_ERROR) {
if ( MSG_IS_REPLIED(msginfo->flags) && !(newflags & MSG_REPLIED))
flags_unset |= IMAP_FLAG_ANSWERED;
+ if (!MSG_IS_FORWARDED(msginfo->flags) && (newflags & MSG_FORWARDED))
+ flags_set |= IMAP_FLAG_FORWARDED;
+ if ( MSG_IS_FORWARDED(msginfo->flags) && !(newflags & MSG_FORWARDED))
+ flags_unset |= IMAP_FLAG_FORWARDED;
+
if (!MSG_IS_DELETED(msginfo->flags) && (newflags & MSG_DELETED))
flags_set |= IMAP_FLAG_DELETED;
if ( MSG_IS_DELETED(msginfo->flags) && !(newflags & MSG_DELETED))
} else {
debug_print("IMAP changing flags\n");
if (flags_set) {
- ok = imap_set_message_flags(session, &numlist, flags_set, NULL, TRUE);
+ ok = imap_set_message_flags(session, IMAP_FOLDER_ITEM(item), &numlist, flags_set, NULL, TRUE);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
}
if (flags_unset) {
- ok = imap_set_message_flags(session, &numlist, flags_unset, NULL, FALSE);
+ ok = imap_set_message_flags(session, IMAP_FOLDER_ITEM(item), &numlist, flags_unset, NULL, FALSE);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
numlist.data = GINT_TO_POINTER(uid);
ok = imap_set_message_flags
- (session, &numlist, IMAP_FLAG_DELETED, NULL, TRUE);
+ (session, IMAP_FOLDER_ITEM(item), &numlist, IMAP_FLAG_DELETED, NULL, TRUE);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't set deleted flags: %d\n"), uid);
return ok;
return elem != NULL ? GPOINTER_TO_INT(elem->data) : (gint)-1;
}
+static gboolean flag_ok(IMAPFolderItem *item, guint flag)
+{
+ if (item->ok_flags && g_slist_find(item->ok_flags, GUINT_TO_POINTER(flag))) {
+ debug_print("flag %d is OK\n", flag);
+ return TRUE;
+ }
+ if (item->can_create_flags == ITEM_CAN_CREATE_FLAGS) {
+ debug_print("creating flags is OK\n");
+ return TRUE;
+ }
+ return FALSE;
+}
+
/*
* NEW and DELETED flags are not syncronized
* - The NEW/RECENT flags in IMAP folders can not really be directly
GHashTable *tags_hash = NULL;
gboolean full_search = stuff->full_search;
GSList *sorted_list = NULL;
- GSList *unseen = NULL, *answered = NULL, *flagged = NULL, *deleted = NULL;
- GSList *p_unseen, *p_answered, *p_flagged, *p_deleted;
+ GSList *unseen = NULL, *answered = NULL, *flagged = NULL, *deleted = NULL, *forwarded = NULL;
+ GSList *p_unseen, *p_answered, *p_flagged, *p_deleted, *p_forwarded;
GSList *seq_list, *cur;
gboolean reverse_seen = FALSE;
gboolean selected_folder;
goto bail;
}
+ if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_FORWARDED)) {
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED,
+ full_search ? NULL:imapset, &lep_uidlist);
+ if (r == MAILIMAP_NO_ERROR) {
+ GSList * uidlist;
+
+ uidlist = imap_uid_list_from_lep(lep_uidlist);
+ mailimap_search_result_free(lep_uidlist);
+
+ forwarded = g_slist_concat(forwarded, uidlist);
+ } else {
+ imap_handle_error(SESSION(session), r);
+ goto bail;
+ }
+ }
+
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
}
p_unseen = unseen;
p_answered = answered;
+ p_forwarded = forwarded;
p_flagged = flagged;
p_deleted = deleted;
msginfo = (MsgInfo *) elem->data;
flags = msginfo->flags.perm_flags;
wasnew = (flags & MSG_NEW);
- oldflags = flags & ~(MSG_NEW|MSG_UNREAD|MSG_REPLIED|MSG_MARKED|MSG_DELETED);
+ oldflags = flags & ~(MSG_NEW|MSG_UNREAD|MSG_REPLIED|MSG_FORWARDED|MSG_MARKED|MSG_DELETED);
if (folder->account && folder->account->low_bandwidth) {
if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
- flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_MARKED);
+ flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_FORWARDED | MSG_MARKED);
} else {
flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW | MSG_MARKED));
}
flags |= MSG_REPLIED;
else
flags &= ~MSG_REPLIED;
+ if (gslist_find_next_num(&p_forwarded, msginfo->msgnum) == msginfo->msgnum)
+ flags |= MSG_FORWARDED;
+ else
+ flags &= ~MSG_FORWARDED;
if (gslist_find_next_num(&p_deleted, msginfo->msgnum) == msginfo->msgnum)
flags |= MSG_DELETED;
else
g_slist_free(flagged);
g_slist_free(deleted);
g_slist_free(answered);
+ g_slist_free(forwarded);
g_slist_free(unseen);
g_slist_free(sorted_list);
NULL, NULL, NULL, NULL, NULL, FALSE);
}
if (ok == MAILIMAP_NO_ERROR) {
- ok = imap_set_message_flags(session, data->msglist, flags_value, NULL, flags_set);
+ ok = imap_set_message_flags(session, IMAP_FOLDER_ITEM(item),
+ data->msglist, flags_value, NULL, flags_set);
} else {
g_warning("can't select mailbox %s\n", item->path);
}
GSList list;
list.data = str;
list.next = NULL;
- ok = imap_set_message_flags(session, data->msglist, 0, &list, tags_set);
+ ok = imap_set_message_flags(session, IMAP_FOLDER_ITEM(item),
+ data->msglist, 0, &list, tags_set);
} else {
g_warning("can't select mailbox %s\n", item->path);
}
g_slist_free(seq_list);
}
-static struct mailimap_flag_list * imap_flag_to_lep(IMAPFlags flags, GSList *tags)
+static struct mailimap_flag_list * imap_flag_to_lep(IMAPFolderItem *item, IMAPFlags flags, GSList *tags)
{
struct mailimap_flag_list * flag_list;
GSList *cur = tags;
flag_list = mailimap_flag_list_new_empty();
- if (IMAP_IS_SEEN(flags))
+ if (IMAP_IS_SEEN(flags) && flag_ok(item, IMAP_FLAG_SEEN))
mailimap_flag_list_add(flag_list,
mailimap_flag_new_seen());
- if (IMAP_IS_ANSWERED(flags))
+ if (IMAP_IS_ANSWERED(flags) && flag_ok(item, IMAP_FLAG_ANSWERED))
mailimap_flag_list_add(flag_list,
mailimap_flag_new_answered());
- if (IMAP_IS_FLAGGED(flags))
+ if (IMAP_IS_FLAGGED(flags) && flag_ok(item, IMAP_FLAG_FLAGGED))
mailimap_flag_list_add(flag_list,
mailimap_flag_new_flagged());
- if (IMAP_IS_DELETED(flags))
+ if (IMAP_IS_DELETED(flags) && flag_ok(item, IMAP_FLAG_DELETED))
mailimap_flag_list_add(flag_list,
mailimap_flag_new_deleted());
- if (IMAP_IS_DRAFT(flags))
+ if (IMAP_IS_DRAFT(flags) && flag_ok(item, IMAP_FLAG_DRAFT))
mailimap_flag_list_add(flag_list,
mailimap_flag_new_draft());
+ if (IMAP_IS_FORWARDED(flags) && flag_ok(item, IMAP_FLAG_FORWARDED))
+ mailimap_flag_list_add(flag_list,
+ mailimap_flag_new_flag_keyword(strdup("$Forwarded")));
for (; cur; cur = cur->next) {
gchar *enc_str =
void imap_disconnect_all(void)
{
GList *list;
+ gboolean short_timeout;
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ GError *error;
+#endif
+
+#ifdef HAVE_NETWORKMANAGER_SUPPORT
+ error = NULL;
+ short_timeout = !networkmanager_is_online(&error);
+ if(error) {
+ short_timeout = TRUE;
+ g_error_free(error);
+ }
+#else
+ short_timeout = TRUE;
+#endif
+
+ if(short_timeout)
+ imap_main_set_timeout(1);
+
for (list = account_get_list(); list != NULL; list = list->next) {
PrefsAccount *account = list->data;
if (account->protocol == A_IMAP4) {
}
}
}
+
+ if(short_timeout)
+ imap_main_set_timeout(prefs_common.io_timeout_secs);
}
void imap_folder_unref(Folder *folder)
projects / claws.git / blobdiff