aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-object.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-10-22 02:51:30 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-10-22 02:51:30 +0800
commit21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36 (patch)
tree0111dbe4d8a6d5617f5e5406001b0024e4293169 /camel/camel-object.c
parent653cfffc0e00dfb59b36813c1b45c53d3f773c65 (diff)
downloadgsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar.gz
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar.bz2
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar.lz
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar.xz
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.tar.zst
gsoc2013-evolution-21743ac2cfa2d2ddcd539e9b7695cc8dd720ef36.zip
Merge new-ui-branch into the trunk.
svn path=/trunk/; revision=22966
Diffstat (limited to 'camel/camel-object.c')
-rw-r--r--camel/camel-object.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 31d458a59d..744e9f7566 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -439,6 +439,7 @@ cobject_state_read(CamelObject *obj, FILE *fp)
switch(argv->argv[argv->argc].tag & CAMEL_ARG_TYPE) {
case CAMEL_ARG_INT:
+ case CAMEL_ARG_BOO:
if (camel_file_util_decode_uint32(fp, &argv->argv[argv->argc].ca_int) == -1)
goto cleanup;
break;
@@ -535,6 +536,7 @@ cobject_state_write(CamelObject *obj, FILE *fp)
switch (arg->tag & CAMEL_ARG_TYPE) {
case CAMEL_ARG_INT:
+ case CAMEL_ARG_BOO:
if (camel_file_util_encode_uint32(fp, arg->ca_int) == -1)
goto abort;
break;
@@ -547,6 +549,13 @@ cobject_state_write(CamelObject *obj, FILE *fp)
res = 0;
abort:
+ for (i=0;i<argv->argc;i++) {
+ CamelArg *arg = &argv->argv[i];
+
+ if ((argv->argv[i].tag & CAMEL_ARG_TYPE) == CAMEL_ARG_STR)
+ camel_object_free(obj, arg->tag, arg->ca_str);
+ }
+
g_free(argv);
g_free(arggetv);