Changeset fc8a87a for messagelist.c

Timestamp:

Jun 25, 2011, 3:26:15 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

f9df2f0

Parents:

12294d2

git-author:

David Benjamin <davidben@mit.edu> (03/10/11 14:49:02)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:15)

Message:

Replace owl_messagelist's internal owl_list with GPtrArray

File:

• messagelist.c (modified) (7 diffs)

messagelist.c

@@ -3 +3 @@
 #include <string.h>
 
-int owl_messagelist_create(owl_messagelist *ml)
+void owl_messagelist_create(owl_messagelist *ml)
 {
-  owl_list_create(&(ml->list));
-  return(0);
+  ml->list = g_ptr_array_new();
+}
+
+void owl_messagelist_cleanup(owl_messagelist *ml, bool free_messages)
+{
+  if (free_messages)
+    g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL);
+  g_ptr_array_free(ml->list, true);
 }
 
 int owl_messagelist_get_size(const owl_messagelist *ml)
 {
-  return(owl_list_get_size(&(ml->list)));
+  return ml->list->len;
 }
 
 void *owl_messagelist_get_element(const owl_messagelist *ml, int n)
 {
-  return(owl_list_get_element(&(ml->list), n));
+  return ml->list->pdata[n];
 }
 
@@ -26 +32 @@
 
   first = 0;
-  last = owl_list_get_size(&(ml->list)) - 1;
+  last = ml->list->len - 1;
   while (first <= last) {
     mid = (first + last) / 2;
-    m = owl_list_get_element(&(ml->list), mid);
+    m = ml->list->pdata[mid];
     msg_id = owl_message_get_id(m);
     if (msg_id == target_id) {
@@ -44 +50 @@
 void owl_messagelist_append_element(owl_messagelist *ml, void *element)
 {
-  owl_list_append_element(&ml->list, element);
+  g_ptr_array_add(ml->list, element);
 }
 
@@ -51 +57 @@
 {
   /* mark a message as deleted */
-  owl_message_mark_delete(owl_list_get_element(&(ml->list), n));
+  owl_message_mark_delete(ml->list->pdata[n]);
   return(0);
 }
@@ -58 +64 @@
 {
   /* mark a message as deleted */
-  owl_message_unmark_delete(owl_list_get_element(&(ml->list), n));
+  owl_message_unmark_delete(ml->list->pdata[n]);
   return(0);
 }
@@ -65 +71 @@
 {
   /* expunge deleted messages */
-  int i, j;
-  owl_list newlist;
+  int i;
+  GPtrArray *newlist;
   owl_message *m;
 
-  owl_list_create(&newlist);
+  newlist = g_ptr_array_new();
   /*create a new list without messages marked as deleted */
-  j=owl_list_get_size(&(ml->list));
-  for (i=0; i<j; i++) {
-    m=owl_list_get_element(&(ml->list), i);
+  for (i = 0; i < ml->list->len; i++) {
+    m = ml->list->pdata[i];
     if (owl_message_is_delete(m)) {
       owl_message_delete(m);
     } else {
-      owl_list_append_element(&newlist, m);
+      g_ptr_array_add(newlist, m);
     }
   }
 
   /* free the old list */
-  owl_list_cleanup(&(ml->list), NULL);
+  g_ptr_array_free(ml->list, true);
 
   /* copy the new list to the old list */
@@ -92 +97 @@
 void owl_messagelist_invalidate_formats(const owl_messagelist *ml)
 {
-  int i, j;
+  int i;
   owl_message *m;
 
-  j=owl_list_get_size(&(ml->list));
-  for (i=0; i<j; i++) {
-    m=owl_list_get_element(&(ml->list), i);
+  for (i = 0; i < ml->list->len; i++) {
+    m = ml->list->pdata[i];
     owl_message_invalidate_format(m);
   }