static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
/* Signal handlers */
-static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
+/* static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data); */
static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
+static TnyFolder*modest_tny_send_queue_get_outbox (TnySendQueue *self);
+static TnyFolder*modest_tny_send_queue_get_sentbox (TnySendQueue *self);
/* list my signals */
enum {
g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
}
+ /* Set flags to supend sending operaiton (if removed, this is not necessary) */
+ if (!remove) {
+ TnyIterator *iter = NULL;
+ TnyFolder *outbox = NULL;
+ TnyList *headers = tny_simple_list_new ();
+ outbox = modest_tny_send_queue_get_outbox (self);
+ tny_folder_get_headers (outbox, headers, TRUE, err);
+ if (err != NULL && *err != NULL) goto frees;
+ iter = tny_list_create_iterator (headers);
+ while (!tny_iterator_is_done (iter)) {
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
+ tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+ g_object_unref (header);
+ tny_iterator_next (iter);
+ }
+ frees:
+ g_object_unref (G_OBJECT (headers));
+ g_object_unref (G_OBJECT (outbox));
+ }
+
+ /* Dont call super class implementaiton, becasue camel removes messages from outbox */
TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove, err); /* FIXME */
}
}
folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
TNY_FOLDER_TYPE_OUTBOX);
+
+ /* This vfunc's tinymail contract does not allow it to return NULL. */
+ if (!folder) {
+ g_warning("%s: Returning NULL.\n", __FUNCTION__);
+ }
+
g_object_unref (G_OBJECT(account));
return folder;
/* Connect signals to control when a msg is being or has been sent */
/* TODO: this signal was implemented in tinymail camel send queue, but im
waiting for implement some unit tests nbefore commited changes */
- if (FALSE) {
- g_signal_connect (G_OBJECT(self), "msg-sending",
- G_CALLBACK(_on_msg_start_sending),
- NULL);
- }
+/* if (FALSE) { */
+/* g_signal_connect (G_OBJECT(self), "msg-sending", */
+/* G_CALLBACK(_on_msg_start_sending), */
+/* NULL); */
+/* } */
g_signal_connect (G_OBJECT(self), "msg-sent",
G_CALLBACK(_on_msg_has_been_sent),
void
modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
{
- /* TODO: Rename this to tny_camel_send_queue_try_to_send() in tinymail
- and check that it works, without creating a second worker. */
-/* tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
+ /* Flush send queue */
+ tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self));
}
-#if 0
gboolean
modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self,
const gchar *msg_id)
{
- ModestTnySendQueuePrivate *priv;
+ ModestTnySendQueueStatus status;
g_return_val_if_fail (msg_id != NULL, FALSE);
- priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- if (modest_tny_send_queue_sending_in_progress(self))
- return g_ascii_strcasecmp(priv->current_msg_id, msg_id);
- else
- return FALSE;
+ status = modest_tny_send_queue_get_msg_status (self, msg_id);
+ return status == MODEST_TNY_SEND_QUEUE_SENDING;
}
-#endif
gboolean
modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
return ((SendInfo*)item->data)->status;
}
-static void
-_on_msg_start_sending (TnySendQueue *self,
- TnyMsg *msg,
- gpointer user_data)
-{
- ModestTnySendQueuePrivate *priv;
- TnyHeader *header;
- GList *item;
- SendInfo *info;
+/* static void */
+/* _on_msg_start_sending (TnySendQueue *self, */
+/* TnyMsg *msg, */
+/* gpointer user_data) */
+/* { */
+/* ModestTnySendQueuePrivate *priv; */
+/* TnyHeader *header; */
+/* GList *item; */
+/* SendInfo *info; */
- priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+/* priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */
- header = tny_msg_get_header(msg);
- item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
+/* header = tny_msg_get_header(msg); */
+/* item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */
- if (item != NULL)
- {
- info = item->data;
- info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+/* if (item != NULL) */
+/* { */
+/* info = item->data; */
+/* info->status = MODEST_TNY_SEND_QUEUE_SENDING; */
- g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
- }
+/* g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
+/* } */
- priv->current = item;
-}
+/* priv->current = item; */
+/* } */
static void
_on_msg_has_been_sent (TnySendQueue *self,
GError *err,
gpointer user_data)
{
- ModestTnySendQueuePrivate *priv;
- SendInfo *info;
- GList *item;
+/* ModestTnySendQueuePrivate *priv; */
+/* SendInfo *info; */
+/* GList *item; */
+/* TnyHeader *msg_header; */
- priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+/* priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */
/* TODO: Use this version as soon as the msg-sending
* notification works */
-#if 0
- item = priv->current;
- g_assert(item != NULL);
- info = priv->current->data;
-#else
- /* TODO: Why do we get the msg and its header separately? The docs
- * don't really tell. */
- g_assert(header == tny_msg_get_header (msg)); // ????
- item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
- g_assert(item != NULL);
- info = item->data;
-#endif
+/* #if 0 */
+/* item = priv->current; */
+/* g_assert(item != NULL); */
+/* info = priv->current->data; */
+/* #else */
+/* /\* TODO: Why do we get the msg and its header separately? The docs */
+/* * don't really tell. *\/ */
+/* g_assert(header == tny_msg_get_header (msg)); // ???? */
+/* msg_header = tny_msg_get_header (msg); */
+/* item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), */
+/* tny_header_get_message_id (msg_header)); */
+/* g_object_unref (msg_header); */
+/* g_assert(item != NULL); */
+/* info = item->data; */
+/* #endif */
/* Keep in queue so that we remember that the opertion has failed
* and was not just cancelled */
- info->status = MODEST_TNY_SEND_QUEUE_FAILED;
- g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+/* info->status = MODEST_TNY_SEND_QUEUE_FAILED; */
+/* g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
}
projects / modest / blobdiff