static void _on_queue_start (TnySendQueue *self,
gpointer user_data);
+static void _on_queue_stop (TnySendQueue *self,
+ gpointer data);
+
static void modest_tny_send_queue_add_async (TnySendQueue *self,
TnyMsg *msg,
TnySendQueueAddCallback callback,
/* last was send receive operation?*/
gboolean requested_send_receive;
+
+ gboolean sending;
};
#define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (instance);
priv->queue = g_queue_new();
priv->current = NULL;
+ priv->outbox = NULL;
+ priv->sentbox = NULL;
+ priv->sending = FALSE;
}
static void
modest_tny_send_queue_finalize (GObject *obj)
{
ModestTnySendQueuePrivate *priv;
-
+
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj);
g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
g_queue_free (priv->queue);
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
g_object_unref (priv->outbox);
g_object_unref (priv->sentbox);
-
- G_OBJECT_CLASS(parent_class)->finalize (obj);
}
typedef struct {
g_signal_connect (G_OBJECT(self), "error-happened",
G_CALLBACK(_on_msg_error_happened),
NULL);
+
g_signal_connect (G_OBJECT (self), "queue-start",
G_CALLBACK (_on_queue_start),
NULL);
+ g_signal_connect (G_OBJECT (self), "queue-stop",
+ G_CALLBACK (_on_queue_stop),
+ NULL);
priv->requested_send_receive = FALSE;
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- return priv->current != NULL;
+ return priv->sending;
}
ModestTnySendQueueStatus
_on_queue_start (TnySendQueue *self,
gpointer data)
{
+ ModestTnySendQueuePrivate *priv;
ModestMailOperation *mail_op;
mail_op = modest_mail_operation_new (NULL);
mail_op);
modest_mail_operation_run_queue (mail_op, MODEST_TNY_SEND_QUEUE (self));
g_object_unref (mail_op);
+
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+ priv->sending = TRUE;
+}
+
+static void
+_on_queue_stop (TnySendQueue *self,
+ gpointer data)
+{
+ ModestTnySendQueuePrivate *priv;
+
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+ priv->sending = FALSE;
}
static void
/* Notify view */
msg_id = modest_tny_send_queue_get_msg_id (header);
item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
- info = (SendInfo *) item->data;
+ if (!item) {
+ info = g_slice_new (SendInfo);
+ info->msg_id = msg_id;
+ g_queue_push_tail (priv->queue, info);
+ } else {
+ info = (SendInfo *) item->data;
+ g_free (msg_id);
+ }
info->status = MODEST_TNY_SEND_QUEUE_WAITING;
- g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
-
- /* Frees */
- g_free (msg_id);
+ g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
}
/* Frees */