Changeset d8e2f07 for global.c

Timestamp:

Jun 25, 2011, 4:11:19 AM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

95b52d1 (diff), 2560529 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2560529186e398f85a038e8683d29058857eb7b7 into 95b52d17a566adefc77f07749218fe0cb33a66b2

File:

• global.c (modified) (5 diffs)

global.c

@@ -47 +47 @@
   owl_dict_create(&(g->filters));
   g->filterlist = NULL;
-  owl_list_create(&(g->puntlist));
+  g->puntlist = g_ptr_array_new();
   g->messagequeue = g_queue_new();
   owl_dict_create(&(g->styledict));
@@ -172 +172 @@
 /* Pops the current context from the context stack and returns it. Caller is
  * responsible for freeing. */
-G_GNUC_WARN_UNUSED_RESULT owl_context *owl_global_pop_context_no_delete(owl_global *g)
+CALLER_OWN owl_context *owl_global_pop_context_no_delete(owl_global *g)
 {
   owl_context *c;
@@ -579 +579 @@
 /* puntlist */
 
-owl_list *owl_global_get_puntlist(owl_global *g) {
-  return(&(g->puntlist));
+GPtrArray *owl_global_get_puntlist(owl_global *g) {
+  return g->puntlist;
 }
 
 int owl_global_message_is_puntable(owl_global *g, const owl_message *m) {
-  const owl_list *pl;
-  int i, j;
-
-  pl=owl_global_get_puntlist(g);
-  j=owl_list_get_size(pl);
-  for (i=0; i<j; i++) {
-    if (owl_filter_message_match(owl_list_get_element(pl, i), m)) return(1);
-  }
-  return(0);
+  const GPtrArray *pl;
+  int i;
+
+  pl = owl_global_get_puntlist(g);
+  for (i = 0; i < pl->len; i++) {
+    if (owl_filter_message_match(pl->pdata[i], m)) return 1;
+  }
+  return 0;
 }
 
@@ -725 +724 @@
  * necessary.
  */
-owl_message G_GNUC_WARN_UNUSED_RESULT *owl_global_messagequeue_popmsg(owl_global *g)
+CALLER_OWN owl_message *owl_global_messagequeue_popmsg(owl_global *g)
 {
   owl_message *out;
@@ -754 +753 @@
 }
 
-void owl_global_get_style_names(const owl_global *g, owl_list *l) {
-  owl_dict_get_keys(&(g->styledict), l);
+CALLER_OWN GPtrArray *owl_global_get_style_names(const owl_global *g)
+{
+  return owl_dict_get_keys(&g->styledict);
 }