projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2004-11-09 [colin] 0.9.12cvs144.1
[claws.git] / src / folder.c
diff --git a/src/folder.c b/src/folder.c
index 8d023be4662047b48b1cf30ca2753a31da994516..f50b6d784a97fd74a0f217b185af64552d7c3244 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -413,17 +413,17 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 
                if (!attr || !attr->name || !attr->value) continue;
                if (!strcmp(attr->name, "type")) {
-                       if (!strcasecmp(attr->value, "normal"))
+                       if (!g_ascii_strcasecmp(attr->value, "normal"))
                                item->stype = F_NORMAL;
-                       else if (!strcasecmp(attr->value, "inbox"))
+                       else if (!g_ascii_strcasecmp(attr->value, "inbox"))
                                item->stype = F_INBOX;
-                       else if (!strcasecmp(attr->value, "outbox"))
+                       else if (!g_ascii_strcasecmp(attr->value, "outbox"))
                                item->stype = F_OUTBOX;
-                       else if (!strcasecmp(attr->value, "draft"))
+                       else if (!g_ascii_strcasecmp(attr->value, "draft"))
                                item->stype = F_DRAFT;
-                       else if (!strcasecmp(attr->value, "queue"))
+                       else if (!g_ascii_strcasecmp(attr->value, "queue"))
                                item->stype = F_QUEUE;
-                       else if (!strcasecmp(attr->value, "trash"))
+                       else if (!g_ascii_strcasecmp(attr->value, "trash"))
                                item->stype = F_TRASH;
                } else if (!strcmp(attr->name, "name")) {
                        if (item->name != NULL)
@@ -899,7 +899,7 @@ static gboolean folder_get_status_full_all_func(GNode *node, gpointer data)
 
        if (status->str) {
                id = folder_item_get_identifier(item);
-               g_string_sprintfa(status->str, "%5d %5d %5d %s\n",
+               g_string_append_printf(status->str, "%5d %5d %5d %s\n",
                                  item->new_msgs, item->unread_msgs,
                                  item->total_msgs, id);
                g_free(id);
@@ -958,7 +958,7 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
                                gchar *id;
 
                                id = folder_item_get_identifier(item);
-                               g_string_sprintfa(str, "%5d %5d %5d %s\n",
+                               g_string_append_printf(str, "%5d %5d %5d %s\n",
                                                  item->new_msgs, item->unread_msgs,
                                                  item->total_msgs, id);
                                g_free(id);
@@ -970,9 +970,9 @@ gchar *folder_get_status(GPtrArray *folders, gboolean full)
        }
 
        if (full)
-               g_string_sprintfa(str, "%5d %5d %5d\n", new, unread, total);
+               g_string_append_printf(str, "%5d %5d %5d\n", new, unread, total);
        else
-               g_string_sprintfa(str, "%d %d %d\n", new, unread, total);
+               g_string_append_printf(str, "%d %d %d\n", new, unread, total);
 
        ret = str->str;
        g_string_free(str, FALSE);
@@ -1077,7 +1077,7 @@ FolderClass *folder_get_class_from_string(const gchar *str)
        classlist = folder_get_class_list();
        for (; classlist != NULL; classlist = g_slist_next(classlist)) {
                FolderClass *class = (FolderClass *) classlist->data;
-               if (g_strcasecmp(class->idstr, str) == 0)
+               if (g_ascii_strcasecmp(class->idstr, str) == 0)
                        return class;
        }
 
@@ -1526,6 +1526,50 @@ static MsgInfo *get_msginfo(FolderItem *item, guint num)
        return msginfo;
 }
 
+static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
+{
+       GRelation *relation;
+       gint ret = 0;
+       GSList *cur;
+
+       if(msglist == NULL)
+               return 0;
+       if(item->folder->klass->get_flags == NULL)
+               return 0;
+
+       relation = g_relation_new(2);
+       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+       if ((ret = item->folder->klass->get_flags(
+           item->folder, item, msglist, relation)) == 0) {
+               GTuples *tuples;
+               MsgInfo *msginfo;
+               MsgPermFlags permflags;
+               gboolean skip;
+
+               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+                       msginfo = (MsgInfo *) cur->data;
+               
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       skip = tuples->len < 1;
+                       if (!skip)
+                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+                       if (skip)
+                               continue;
+                       
+                       if (msginfo->flags.perm_flags != permflags) {
+                               procmsg_msginfo_set_flags(msginfo,
+                                       permflags & ~msginfo->flags.perm_flags, 0);
+                               procmsg_msginfo_unset_flags(msginfo,
+                                       ~permflags & msginfo->flags.perm_flags, 0);
+                       }
+               }
+       }
+       g_relation_destroy(relation);   
+
+       return ret;
+}
+
 gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 {
        Folder *folder;
@@ -1704,6 +1748,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                g_slist_free(new_list);
        }
 
+       syncronize_flags(item, exists_list);
+
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem;
@@ -1767,60 +1813,6 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        return 0;
 }
 
-gint folder_item_syncronize_flags(FolderItem *item)
-{
-       MsgInfoList *msglist = NULL;
-       GSList *cur;
-       GRelation *relation;
-       gint ret = 0;
-       
-       g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->folder != NULL, -1);
-       g_return_val_if_fail(item->folder->klass != NULL, -1);
-       if(item->folder->klass->get_flags == NULL)
-               return 0;
-       
-       if (item->cache == NULL)
-               folder_item_read_cache(item);
-       
-       msglist = msgcache_get_msg_list(item->cache);
-       
-       relation = g_relation_new(2);
-       g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
-       if ((ret = item->folder->klass->get_flags(
-           item->folder, item, msglist, relation)) == 0) {
-               GTuples *tuples;
-               MsgInfo *msginfo;
-               MsgPermFlags permflags;
-               gboolean skip;
-
-               for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
-                       msginfo = (MsgInfo *) cur->data;
-               
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       skip = tuples->len < 1;
-                       if (!skip)
-                               permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-                       if (skip)
-                               continue;
-                       
-                       if (msginfo->flags.perm_flags != permflags) {
-                               procmsg_msginfo_set_flags(msginfo,
-                                       permflags & ~msginfo->flags.perm_flags, 0);
-                               procmsg_msginfo_unset_flags(msginfo,
-                                       ~permflags & msginfo->flags.perm_flags, 0);
-                       }
-               }
-       }
-       g_relation_destroy(relation);
-       
-       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
-               procmsg_msginfo_free((MsgInfo *) cur->data);
-       
-       return ret;
-}
-
 gint folder_item_scan(FolderItem *item)
 {
        return folder_item_scan_full(item, TRUE);
@@ -1862,6 +1854,29 @@ void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
        *memusage += msgcache_get_memory_usage(item->cache);
 }
 
+gint folder_item_syncronize_flags(FolderItem *item)
+{
+       MsgInfoList *msglist = NULL;
+       GSList *cur;
+       gint ret = 0;
+       
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(item->folder->klass != NULL, -1);
+       
+       if (item->cache == NULL)
+               folder_item_read_cache(item);
+       
+       msglist = msgcache_get_msg_list(item->cache);
+       
+       ret = syncronize_flags(item, msglist);
+
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
+               procmsg_msginfo_free((MsgInfo *) cur->data);
+       
+       return ret;
+}
+
 gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
 {
        FolderItem *fa = (FolderItem *)a;
Claws Mail