Changeset 219f52c
- Timestamp:
- Jan 23, 2012, 5:27:42 PM (13 years ago)
- 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)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
global.c
rab88b05 r219f52c 75 75 g_free(cd); 76 76 77 owl_messagelist_create(&(g->msglist));77 g->msglist = owl_messagelist_new(); 78 78 79 79 _owl_global_init_windows(g); … … 257 257 258 258 owl_messagelist *owl_global_get_msglist(owl_global *g) { 259 return (&(g->msglist));259 return g->msglist; 260 260 } 261 261 -
messagelist.c
rf271129 r219f52c 1 1 #include "owl.h" 2 2 3 void owl_messagelist_create(owl_messagelist *ml)3 CALLER_OWN owl_messagelist *owl_messagelist_new(void) 4 4 { 5 owl_messagelist *ml = g_new(owl_messagelist, 1); 5 6 ml->list = g_ptr_array_new(); 7 return ml; 6 8 } 7 9 8 void owl_messagelist_ cleanup(owl_messagelist *ml, bool free_messages)10 void owl_messagelist_delete(owl_messagelist *ml, bool free_messages) 9 11 { 10 12 if (free_messages) 11 13 g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL); 12 14 g_ptr_array_free(ml->list, true); 15 g_free(ml); 13 16 } 14 17 -
owl.h
rab88b05 r219f52c 452 452 char *name; 453 453 owl_filter *filter; 454 owl_messagelist ml;454 owl_messagelist *ml; 455 455 const owl_style *style; 456 456 int cachedmsgid; … … 551 551 int curmsg_vert_offset; 552 552 owl_view current_view; 553 owl_messagelist msglist;553 owl_messagelist *msglist; 554 554 WINDOW *input_pad; 555 555 owl_mainpanel mainpanel; -
view.c
rf271129 r219f52c 6 6 v->filter=f; 7 7 v->style=s; 8 owl_messagelist_create(&(v->ml));8 v->ml = owl_messagelist_new(); 9 9 owl_view_recalculate(v); 10 10 } … … 19 19 { 20 20 if (owl_filter_message_match(v->filter, m)) { 21 owl_messagelist_append_element( &(v->ml), m);21 owl_messagelist_append_element(v->ml, m); 22 22 } 23 23 } … … 30 30 int i, j; 31 31 const owl_messagelist *gml; 32 owl_messagelist *ml;33 32 owl_message *m; 34 33 35 34 gml=owl_global_get_msglist(&g); 36 ml=&(v->ml);37 35 38 36 /* nuke the old list, don't free the messages */ 39 owl_messagelist_ cleanup(ml, false);40 owl_messagelist_create(&(v->ml));37 owl_messagelist_delete(v->ml, false); 38 v->ml = owl_messagelist_new(); 41 39 42 40 /* find all the messages we want */ … … 45 43 m=owl_messagelist_get_element(gml, i); 46 44 if (owl_filter_message_match(v->filter, m)) { 47 owl_messagelist_append_element( ml, m);45 owl_messagelist_append_element(v->ml, m); 48 46 } 49 47 } … … 72 70 owl_message *owl_view_get_element(const owl_view *v, int index) 73 71 { 74 return (owl_messagelist_get_element(&(v->ml), index));72 return owl_messagelist_get_element(v->ml, index); 75 73 } 76 74 77 75 void owl_view_delete_element(owl_view *v, int index) 78 76 { 79 owl_messagelist_delete_element( &(v->ml), index);77 owl_messagelist_delete_element(v->ml, index); 80 78 } 81 79 82 80 void owl_view_undelete_element(owl_view *v, int index) 83 81 { 84 owl_messagelist_undelete_element( &(v->ml), index);82 owl_messagelist_undelete_element(v->ml, index); 85 83 } 86 84 87 85 int owl_view_get_size(const owl_view *v) 88 86 { 89 return (owl_messagelist_get_size(&(v->ml)));87 return owl_messagelist_get_size(v->ml); 90 88 } 91 89 … … 158 156 void owl_view_cleanup(owl_view *v) 159 157 { 160 owl_messagelist_ cleanup(&v->ml, false);158 owl_messagelist_delete(v->ml, false); 161 159 g_free(v->name); 162 160 }
Note: See TracChangeset
for help on using the changeset viewer.