static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
/* Signal handlers */
-static void _on_msg_start_sending (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data);
-static void _on_msg_has_been_sent (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, 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);
+static void _on_msg_start_sending (TnySendQueue *self,
+ TnyHeader *header,
+ TnyMsg *msg,
+ int done,
+ int total,
+ gpointer user_data);
+
+static void _on_msg_has_been_sent (TnySendQueue *self,
+ TnyHeader *header,
+ TnyMsg *msg,
+ int done,
+ int total,
+ 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 {
existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
if(existing != NULL)
{
- //g_assert(info->status == MODEST_TNY_SEND_QUEUE_SUSPENDED ||
- // info->status == MODEST_TNY_SEND_QUEUE_FAILED);
-
info = existing->data;
info->status = MODEST_TNY_SEND_QUEUE_WAITING;
}
g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE(self));
g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
- tny_send_queue_add_async (TNY_SEND_QUEUE(self),
+ tny_camel_send_queue_add_async (TNY_CAMEL_SEND_QUEUE(self),
msg,
_on_added_to_outbox,
NULL,
SendInfo *info = NULL;
GList* existing = NULL;
gchar* msg_uid = NULL;
- ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_WAITING;
+ ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
gboolean editing = FALSE;
g_return_if_fail (TNY_IS_SEND_QUEUE(self));
gchar *
modest_tny_send_queue_get_msg_id (TnyHeader *header)
{
- const gchar *uid = NULL;
gchar* msg_uid = NULL;
- gchar **tmp = NULL;
+ const gchar *subject;
+ time_t date_received;
/* Get message uid */
- uid = tny_header_get_uid (header);
- if (uid)
- tmp = g_strsplit (uid, "__", 2);
-
- if (tmp) {
- if (tmp[1] != NULL)
- msg_uid = g_strconcat (tmp[0], "_", NULL);
- else
- msg_uid = g_strdup(tmp[0]);
-
- /* free */
- g_strfreev(tmp);
- }
+ subject = tny_header_get_subject (header);
+ date_received = tny_header_get_date_received (header);
+
+ msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received);
return msg_uid;
}
gpointer user_data)
{
ModestTnySendQueuePrivate *priv;
- GList *item;
gchar *msg_id = NULL;
-
+ GList *item;
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
/* Get message uid */
msg_id = modest_tny_send_queue_get_msg_id (header);
-
+
+ tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
/* Get status info */
item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
- if (!item)
- g_warning ("%s: item should not be NULL", __FUNCTION__);
- else {
-
+ if (item) {
+
/* Remove status info */
modest_tny_send_queue_info_free (item->data);
g_queue_delete_link (priv->queue, item);