#define KB 1024
#define GET_SIZE_BUFFER_SIZE 128
+/*
+ * Remove all these #ifdef stuff when the tinymail's idle calls become
+ * locked
+ */
+#define TINYMAIL_IDLES_NOT_LOCKED_YET 1
+
/* 'private'/'protected' functions */
static void modest_mail_operation_class_init (ModestMailOperationClass *klass);
static void modest_mail_operation_init (ModestMailOperation *obj);
static void modest_mail_operation_notify_end (ModestMailOperation *self);
-static gboolean did_a_cancel = FALSE;
-
enum _ModestMailOperationSignals
{
PROGRESS_CHANGED_SIGNAL,
modest_mail_operation_cancel (ModestMailOperation *self)
{
ModestMailOperationPrivate *priv;
+ gboolean canceled = FALSE;
- if (!MODEST_IS_MAIL_OPERATION (self)) {
- g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
- return FALSE;
- }
+ g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
- if (!priv) {
- g_warning ("BUG: %s: priv == NULL", __FUNCTION__);
- return FALSE;
- }
- did_a_cancel = TRUE;
+ /* Note that if we call cancel with an already canceled mail
+ operation the progress changed signal won't be emitted */
+ if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+ return FALSE;
/* Set new status */
priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
-
- /* This emits progress-changed on which the mail operation queue is
- * listening, so the mail operation is correctly removed from the
- * queue without further explicit calls. */
- modest_mail_operation_notify_end (self);
- return TRUE;
+ /* Cancel the mail operation. We need to wrap it between this
+ start/stop operations to allow following calls to the
+ account */
+ tny_account_cancel (priv->account);
+
+ return canceled;
}
guint
ModestMailOperationState *state;
state = modest_mail_operation_clone_state (mail_op);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
g_slice_free (ModestMailOperationState, state);
return TRUE;
pair = (ModestPair *) data;
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
/* Free the state and the reference to the mail operation */
g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
update_account_thread (gpointer thr_user_data)
{
static gboolean first_time = TRUE;
- UpdateAccountInfo *info;
+ UpdateAccountInfo *info = NULL;
TnyList *all_folders = NULL;
GPtrArray *new_headers = NULL;
TnyIterator *iter = NULL;
TnyFolderStoreQuery *query = NULL;
ModestMailOperationPrivate *priv = NULL;
ModestTnySendQueue *send_queue = NULL;
+ gint num_new_headers = 0;
info = (UpdateAccountInfo *) thr_user_data;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op);
/* Refresh folders */
+ num_new_headers = 0;
new_headers = g_ptr_array_new ();
iter = tny_list_create_iterator (all_folders);
- while (!tny_iterator_is_done (iter) && !priv->error && !did_a_cancel) {
+ while (!tny_iterator_is_done (iter) && !priv->error &&
+ priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
InternalFolderObserver *observer;
TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
g_object_unref (G_OBJECT (folder));
if (priv->error)
- {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- goto out;
- }
-
+
tny_iterator_next (iter);
}
- did_a_cancel = FALSE;
-
g_object_unref (G_OBJECT (iter));
g_source_remove (timeout);
- if (new_headers->len > 0) {
+ if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED &&
+ priv->status != MODEST_MAIL_OPERATION_STATUS_FAILED &&
+ new_headers->len > 0) {
gint msg_num = 0;
/* Order by date */
msg_num++;
}
- g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL);
- g_ptr_array_free (new_headers, FALSE);
}
+
+ /* Get the number of new headers and free them */
+ num_new_headers = new_headers->len;
+ g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL);
+ g_ptr_array_free (new_headers, FALSE);
+ if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+ goto out;
+
/* Perform send (if operation was not cancelled) */
- if (did_a_cancel) goto out;
/* priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; */
priv->done = 0;
priv->total = 0;
/* This thread is not in the main lock */
idle_info = g_malloc0 (sizeof (UpdateAccountInfo));
idle_info->mail_op = g_object_ref (info->mail_op);
- idle_info->new_headers = (new_headers) ? new_headers->len : 0;
+ idle_info->new_headers = num_new_headers;
idle_info->callback = info->callback;
g_idle_add (idle_update_account_cb, idle_info);
}
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
g_slice_free (ModestMailOperationState, state);
}
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
- TnyFolder *folder = tny_header_get_folder (helper->header);
- if (folder) {
- TnyAccount *account;
- account = tny_folder_get_account (folder);
- if (account) {
- tny_account_cancel (account);
- g_object_unref (account);
- }
- g_object_unref (folder);
- }
-
- return;
- }
-
priv->done = 1;
priv->total = 1;
state = modest_mail_operation_clone_state (self);
state->bytes_done = status->position;
state->bytes_total = status->of_total;
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
g_slice_free (ModestMailOperationState, state);
}
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
g_slice_free (ModestMailOperationState, state);
}
}
/* Free */
- g_object_unref (helper->mail_op);
+/* g_object_unref (helper->mail_op); */
g_slice_free (RefreshAsyncHelper, helper);
/* Notify about operation end */
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_enter ();
+#endif
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET
+ gdk_threads_leave ();
+#endif
g_slice_free (ModestMailOperationState, state);
}
/* Create the helper */
helper = g_slice_new0 (RefreshAsyncHelper);
- helper->mail_op = g_object_ref(self);
+ helper->mail_op = g_object_ref (self);
helper->user_callback = user_callback;
helper->user_data = user_data;
priv->account_name = NULL;
}
- /* Notify the observers about the mail opertation end */
+ /* Notify the observers about the mail operation end */
+ /* We do not wrapp this emission because we assume that this
+ function is always called from within the main lock */
state = modest_mail_operation_clone_state (self);
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
g_slice_free (ModestMailOperationState, state);
projects / modest / blobdiff