aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-07 12:16:26 +0800
committerDan Winship <danw@src.gnome.org>2000-08-07 12:16:26 +0800
commit3179eb7162b3f9eb4c81abc76e186bba79aa5a67 (patch)
treeec6475bb6b4ac8f377fa3bf416298f2b70659023 /camel
parenteef4069b806ed069a317661a4c5c59f2de58272f (diff)
downloadgsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar.gz
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar.bz2
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar.lz
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar.xz
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.tar.zst
gsoc2013-evolution-3179eb7162b3f9eb4c81abc76e186bba79aa5a67.zip
Fix this to not require NULL-termination of the array.
* camel-folder.c (camel_folder_free_deep): Fix this to not require NULL-termination of the array. svn path=/trunk/; revision=4560
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-folder.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 27a5d22262..ef9aebeb76 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-07 Dan Winship <danw@helixcode.com>
+
+ * camel-folder.c (camel_folder_free_deep): Fix this to not require
+ NULL-termination of the array.
+
2000-08-04 Jeffrey Stedfast <fejj@helixcode.com>
* providers/imap/camel-imap-store.c (imap_connect): If we fail to
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index caac803ce8..047c814e5e 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1241,6 +1241,9 @@ camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)
void
camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)
{
- g_strfreev ((gchar **)array->pdata);
- g_ptr_array_free (array, FALSE);
+ int i;
+
+ for (i = 0; i < array->len; i++)
+ g_free (array->pdata[i]);
+ g_ptr_array_free (array, TRUE);
}