Changes in messagelist.c [66a8cd6:219f52c]

File:

• messagelist.c (modified) (6 diffs)

messagelist.c

@@ -1 +1 @@
 #include "owl.h"
-#include <stdlib.h>
-#include <string.h>
 
-int owl_messagelist_create(owl_messagelist *ml)
+CALLER_OWN owl_messagelist *owl_messagelist_new(void)
 {
-  owl_list_create(&(ml->list));
-  return(0);
+  owl_messagelist *ml = g_new(owl_messagelist, 1);
+  ml->list = g_ptr_array_new();
+  return ml;
+}
+
+void owl_messagelist_delete(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);
+  g_free(ml);
 }
 
 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));
+  /* we assume things like owl_view_get_element(v, owl_global_get_curmsg(&g))
+   * work even when there are no messages in the message list.  So don't
+   * segfault if someone asks for the zeroth element of an empty list.
+   */
+  if (n >= ml->list->len) return NULL;
+  return ml->list->pdata[n];
 }
 
-owl_message *owl_messagelist_get_by_id(const owl_messagelist *ml, int target_id)
+int owl_messagelist_get_index_by_id(const owl_messagelist *ml, int target_id)
 {
-  /* return the message with id == 'id'.  If it doesn't exist return NULL. */
+  /* return the message index with id == 'id'.  If it doesn't exist return -1. */
   int first, last, mid, msg_id;
   owl_message *m;
 
   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) {
-      return(m);
+      return mid;
     } else if (msg_id < target_id) {
       first = mid + 1;
@@ -39 +51 @@
     }
   }
-  return(NULL);
+  return -1;
 }
 
-int owl_messagelist_append_element(owl_messagelist *ml, void *element)
+owl_message *owl_messagelist_get_by_id(const owl_messagelist *ml, int target_id)
 {
-  return(owl_list_append_element(&(ml->list), element));
+  /* return the message with id == 'id'.  If it doesn't exist return NULL. */
+  int n = owl_messagelist_get_index_by_id(ml, target_id);
+  if (n < 0) return NULL;
+  return ml->list->pdata[n];
+}
+
+void owl_messagelist_append_element(owl_messagelist *ml, void *element)
+{
+  g_ptr_array_add(ml->list, element);
 }
 
@@ -51 +71 @@
 {
   /* 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 +78 @@
 {
   /* 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);
+}
+
+void owl_messagelist_delete_and_expunge_element(owl_messagelist *ml, int n)
+{
+  owl_message_delete(g_ptr_array_remove_index(ml->list, n));
 }
 
@@ -65 +90 @@
 {
   /* 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 +116 @@
 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);
   }