callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to specify INBOX for non-storage type accounts. Email daemon

Browse Source 
allows to store mails in individual INBOX rather than a common one.
This commit is contained in:
Srinivasa Ragavan
2012-03-29 11:28:42 +05:30
parent f552074259
commit afb3db076d
3 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libemail-engine/mail-ops.c
View File

@ -76,8 +76,15 @@ struct _fetch_mail_msg {
GCancellable *cancellable; /* we have our own cancellation
* struct, the other should be empty */
gint keep; /* keep on server? */
gint fetch_count;
CamelFetchType fetch_type;
gint still_more;
void (*done)(gpointer data);
MailProviderFetchLockFunc provider_lock;
MailProviderFetchUnlockFunc provider_unlock;
MailProviderFetchInboxFunc provider_fetch_inbox;
void (*done)(gint still_more, gpointer data);
gpointer data;
};
@ -220,7 +227,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
CamelSession *session;
CamelURL *url;
gboolean is_local_delivery = FALSE;
const gchar *uid;
const gchar *uid = NULL;
gint i;
service = CAMEL_SERVICE (m->store);
@ -259,6 +266,8 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
g_free (url_string);
} else {
uid = camel_service_get_uid (service);
if (m->provider_lock)
m->provider_lock (uid);
folder = fm->source_folder =
e_mail_session_get_inbox_sync (
@ -279,6 +288,12 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
parent_store = camel_folder_get_parent_store (folder);
if (m->fetch_count > 0) {
/* We probably should fetch some old messages first. */
printf("Fetching %d %s messages\n", m->fetch_count, (m->fetch_type == CAMEL_FETCH_NEW_MESSAGES) ? "new" : "old");
m->still_more = camel_folder_fetch_messages_sync (folder, m->fetch_type,
m->fetch_count, cancellable, error) ? 1 : 0 ;
}
service = CAMEL_SERVICE (parent_store);
data_dir = camel_service_get_user_data_dir (service);
@ -289,14 +304,27 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
if (cache) {
GPtrArray *folder_uids, *cache_uids, *uids;
if (m->provider_fetch_inbox) {
g_object_unref (fm->destination);
fm->destination = m->provider_fetch_inbox (uid, cancellable, error);
if (fm->destination == NULL)
goto exit;
g_object_ref (fm->destination);
}
folder_uids = camel_folder_get_uids (folder);
cache_uids = camel_uid_cache_get_new_uids (cache, folder_uids);
printf("Gonna cache uids: %d\n", cache_uids->len);
if (cache_uids) {
/* need to copy this, sigh */
fm->source_uids = uids = g_ptr_array_new ();
g_ptr_array_set_size (uids, cache_uids->len);
/* Reverse it so that we fetch the latest as first, while fetching POP */
for (i = 0; i < cache_uids->len; i++)
uids->pdata[i] = g_strdup (cache_uids->pdata[i]);
uids->pdata[cache_uids->len-i-1] = g_strdup (cache_uids->pdata[i]);
camel_uid_cache_free_uids (cache_uids);
fm->cache = cache;
@ -340,6 +368,9 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
}
exit:
if (!is_local_delivery && m->provider_unlock)
m->provider_unlock (uid);
/* we unref this here as it may have more work to do (syncing
* folders and whatnot) before we are really done */
/* should this be cancellable too? (i.e. above unregister above) */
@ -359,7 +390,7 @@ static void
fetch_mail_done (struct _fetch_mail_msg *m)
{
if (m->done)
m->done (m->data);
m->done (m->still_more, m->data);
}
static void
@ -386,13 +417,18 @@ static MailMsgInfo fetch_mail_info = {
void
mail_fetch_mail (CamelStore *store,
gint keep,
CamelFetchType fetch_type,
gint fetch_count,
const gchar *type,
MailProviderFetchLockFunc lock_func,
MailProviderFetchUnlockFunc unlock_func,
MailProviderFetchInboxFunc fetch_inbox_func,
GCancellable *cancellable,
CamelFilterGetFolderFunc get_folder,
gpointer get_data,
CamelFilterStatusFunc *status,
gpointer status_data,
void (*done)(gpointer data),
void (*done)(int still_more, gpointer data),
gpointer data)
{
struct _fetch_mail_msg *m;
@ -414,6 +450,14 @@ mail_fetch_mail (CamelStore *store,
m->done = done;
m->data = data;
m->fetch_count = fetch_count;
m->fetch_type = fetch_type;
m->still_more = -1;
m->provider_lock = lock_func;
m->provider_unlock = unlock_func;
m->provider_fetch_inbox = fetch_inbox_func;
fm->driver = camel_session_get_filter_driver (session, type, NULL);
camel_filter_driver_set_folder_func (fm->driver, get_folder, get_data);
if (status)

14
libemail-engine/mail-ops.h
View File

@ -71,15 +71,27 @@ void mail_send_queue (EMailSession *session,
void (*done)(gpointer data),
gpointer data);
typedef void (*MailProviderFetchLockFunc) (const char *source);
typedef void (*MailProviderFetchUnlockFunc) (const char *source);
typedef CamelFolder *
(*MailProviderFetchInboxFunc) (const char *source,
GCancellable *cancellable,
GError **error);
void mail_fetch_mail (CamelStore *store,
gint keep,
CamelFetchType fetch_type,
gint fetch_count,
const gchar *type,
MailProviderFetchLockFunc lock_func,
MailProviderFetchUnlockFunc unlock_func,
MailProviderFetchInboxFunc fetch_inbox_func,
GCancellable *cancellable,
CamelFilterGetFolderFunc get_folder,
gpointer get_data,
CamelFilterStatusFunc *status,
gpointer status_data,
void (*done)(gpointer data),
void (*done)(int still_more, gpointer data),
gpointer data);
void mail_filter_folder (EMailSession *session,

28
mail/mail-send-recv.c
View File

@ -140,6 +140,7 @@ static CamelFolder *
const gchar *uri,
gpointer data,
GError **error);
static void send_done (gpointer data);
static struct _send_data *send_data = NULL;
static GtkWidget *send_recv_dialog = NULL;
@ -843,7 +844,7 @@ receive_status (CamelFilterDriver *driver,
/* when receive/send is complete */
static void
receive_done (gpointer data)
receive_done (int still_more, gpointer data)
{
struct _send_info *info = data;
const gchar *uid;
@ -871,7 +872,7 @@ receive_done (gpointer data)
info->cancellable,
receive_get_folder, info,
receive_status, info,
receive_done, info);
send_done, info);
return;
}
@ -911,6 +912,11 @@ receive_done (gpointer data)
free_send_info (info);
}
static void
send_done (gpointer data)
{
receive_done (-1, data);
}
/* although we dont do anythign smart here yet, there is no need for this interface to
* be available to anyone else.
* This can also be used to hook into which folders are being updated, and occasionally
@ -1061,7 +1067,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
static void
refresh_folders_done (struct _refresh_folders_msg *m)
{
receive_done (m->info);
receive_done (-1, m->info);
}
static void
@ -1108,7 +1114,7 @@ receive_update_got_folderinfo (MailFolderCache *folder_cache,
/* do not free folder info, we will free it later */
return FALSE;
} else {
receive_done (data);
receive_done (-1, data);
}
return TRUE;
@ -1128,7 +1134,7 @@ receive_update_got_store (CamelStore *store,
folder_cache, store, info->cancellable,
receive_update_got_folderinfo, info);
} else {
receive_done (info);
receive_done (-1, info);
}
}
@ -1173,8 +1179,9 @@ send_receive (GtkWindow *parent,
case SEND_RECEIVE:
mail_fetch_mail (
CAMEL_STORE (info->service),
info->keep_on_server,
info->keep_on_server, 0, -1,
E_FILTER_SOURCE_INCOMING,
NULL, NULL, NULL,
info->cancellable,
receive_get_folder, info,
receive_status, info,
@ -1189,7 +1196,7 @@ send_receive (GtkWindow *parent,
info->cancellable,
receive_get_folder, info,
receive_status, info,
receive_done, info);
send_done, info);
break;
case SEND_UPDATE:
receive_update_got_store (
@ -1465,8 +1472,9 @@ mail_receive_service (CamelService *service)
case SEND_RECEIVE:
mail_fetch_mail (
CAMEL_STORE (service),
info->keep_on_server,
info->keep_on_server, 0, -1,
E_FILTER_SOURCE_INCOMING,
NULL, NULL, NULL,
info->cancellable,
receive_get_folder, info,
receive_status, info,
@ -1486,7 +1494,7 @@ mail_receive_service (CamelService *service)
info->cancellable,
receive_get_folder, info,
receive_status, info,
receive_done, info);
send_done, info);
break;
case SEND_UPDATE:
receive_update_got_store (CAMEL_STORE (service), info);
@ -1573,5 +1581,5 @@ mail_send (EMailSession *session)
info->cancellable,
receive_get_folder, info,
receive_status, info,
receive_done, info);
send_done, info);
}