Don't show mail_ib_attachment_already_purged, as this string
[modest] / src / modest-tny-send-queue.c
index 1e37c43..357aa3e 100644 (file)
@@ -164,9 +164,8 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
                iter = tny_list_create_iterator (headers);
                while (!tny_iterator_is_done (iter)) {
                        header = TNY_HEADER (tny_iterator_get_current (iter));
-                       if (header) {   
-                               tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
-                               tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+                       if (header) {
+                               tny_header_set_flag (header, TNY_HEADER_FLAG_SUSPENDED);
                                tny_iterator_next (iter);
                                g_object_unref (header);
                        }
@@ -250,7 +249,7 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header)
        SendInfo *info = NULL;
        GList* existing = NULL;
        gchar* msg_uid = NULL;
-       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNONW;
+       ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
        gboolean editing = FALSE;
 
        g_return_if_fail (TNY_IS_SEND_QUEUE(self));
@@ -261,12 +260,10 @@ _add_message (ModestTnySendQueue *self, TnyHeader *header)
        msg_uid = modest_tny_send_queue_get_msg_id (header);
        status = modest_tny_send_queue_get_msg_status (self, msg_uid);
        switch (status) {
-       case MODEST_TNY_SEND_QUEUE_UNKNONW:
+       case MODEST_TNY_SEND_QUEUE_UNKNOWN:
        case MODEST_TNY_SEND_QUEUE_SUSPENDED:
        case MODEST_TNY_SEND_QUEUE_FAILED:
-               if (status != MODEST_TNY_SEND_QUEUE_SUSPENDED)
-                       tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
-               
+
                /* Check if it already exists on queue */
                existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid);
                if(existing != NULL)
@@ -509,7 +506,7 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg
 {
   GList *item;
   item = modest_tny_send_queue_lookup_info (self, msg_id);
-  if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNONW;
+  if(item == NULL) return MODEST_TNY_SEND_QUEUE_UNKNOWN;
   return ((SendInfo*)item->data)->status;
 }
 
@@ -581,7 +578,7 @@ _on_msg_has_been_sent (TnySendQueue *self,
        /* Get message uid */
        msg_id = modest_tny_send_queue_get_msg_id (header);
 
-       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+       tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
 
        /* Get status info */
        item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);