Changeset 219f52c for view.c

Timestamp:

Jan 23, 2012, 5:27:42 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

d126a19

Parents:

ab88b05

git-author:

Jason Gross <jgross@mit.edu> (07/23/11 23:09:55)

git-committer:

Jason Gross <jgross@mit.edu> (01/23/12 17:27:42)

Message:

Allocate owl_messagelist on the heap

This lets us return NULL from owl_global_get_messagelist before the
messagelist has been initilized.

Since g has static duration, g.ml is automatically initialized to NULL.

File:

• view.c (modified) (6 diffs)

view.c

@@ -6 +6 @@
   v->filter=f;
   v->style=s;
-  owl_messagelist_create(&(v->ml));
+  v->ml = owl_messagelist_new();
   owl_view_recalculate(v);
 }
@@ -19 +19 @@
 {
   if (owl_filter_message_match(v->filter, m)) {
-    owl_messagelist_append_element(&(v->ml), m);
+    owl_messagelist_append_element(v->ml, m);
   }
 }
@@ -30 +30 @@
   int i, j;
   const owl_messagelist *gml;
-  owl_messagelist *ml;
   owl_message *m;
 
   gml=owl_global_get_msglist(&g);
-  ml=&(v->ml);
 
   /* nuke the old list, don't free the messages */
-  owl_messagelist_cleanup(ml, false);
-  owl_messagelist_create(&(v->ml));
+  owl_messagelist_delete(v->ml, false);
+  v->ml = owl_messagelist_new();
 
   /* find all the messages we want */
@@ -45 +43 @@
     m=owl_messagelist_get_element(gml, i);
     if (owl_filter_message_match(v->filter, m)) {
-      owl_messagelist_append_element(ml, m);
+      owl_messagelist_append_element(v->ml, m);
     }
   }
@@ -72 +70 @@
 owl_message *owl_view_get_element(const owl_view *v, int index)
 {
-  return(owl_messagelist_get_element(&(v->ml), index));
+  return owl_messagelist_get_element(v->ml, index);
 }
 
 void owl_view_delete_element(owl_view *v, int index)
 {
-  owl_messagelist_delete_element(&(v->ml), index);
+  owl_messagelist_delete_element(v->ml, index);
 }
 
 void owl_view_undelete_element(owl_view *v, int index)
 {
-  owl_messagelist_undelete_element(&(v->ml), index);
+  owl_messagelist_undelete_element(v->ml, index);
 }
 
 int owl_view_get_size(const owl_view *v)
 {
-  return(owl_messagelist_get_size(&(v->ml)));
+  return owl_messagelist_get_size(v->ml);
 }
 
@@ -158 +156 @@
 void owl_view_cleanup(owl_view *v)
 {
-  owl_messagelist_cleanup(&v->ml, false);
+  owl_messagelist_delete(v->ml, false);
   g_free(v->name);
 }