[2889] in BarnOwl Developers
[PATCH] g_ptr_array_new_with_free_func is glib 2.22+
daemon@ATHENA.MIT.EDU (David Benjamin)
Sun Feb 6 23:04:09 2011
From: David Benjamin <davidben@MIT.EDU>
To: barnowl-dev@mit.edu
Date: Sun, 6 Feb 2011 23:04:04 -0500
Use g_ptr_array_foreach instead.
Reported-by: Adam Glasgall <adam@crossproduct.net>
---
util.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/util.c b/util.c
index 7a5b6e1..1d8f8b9 100644
--- a/util.c
+++ b/util.c
@@ -114,7 +114,7 @@ char **owl_parseline(const char *line, int *argc)
GString *curarg;
char quote;
- argv = g_ptr_array_new_with_free_func(owl_free);
+ argv = g_ptr_array_new();
len=strlen(line);
curarg = g_string_new("");
quote='\0';
@@ -175,6 +175,9 @@ char **owl_parseline(const char *line, int *argc)
/* check for unbalanced quotes */
if (quote!='\0') {
+ /* TODO: when we move to requiring glib 2.22+, use
+ * g_ptr_array_new_with_free_func. */
+ g_ptr_array_foreach(argv, (GFunc)owl_free, NULL);
g_ptr_array_free(argv, true);
*argc = -1;
return(NULL);
--
1.7.3.3.399.g06ddf
