[evolution-kolab] KolabDataFolderPermissions: adapt to CamelKolabIMAPXStore API change
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] KolabDataFolderPermissions: adapt to CamelKolabIMAPXStore API change
- Date: Fri, 5 Oct 2012 16:32:36 +0000 (UTC)
commit fec8c7d8296a386a746f53ab062b5313c4b28f4c
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Fri Oct 5 18:27:05 2012 +0200
KolabDataFolderPermissions: adapt to CamelKolabIMAPXStore API change
src/libekolab/kolab-data-folder-permissions.c | 13 +++++++++----
src/libekolab/kolab-data-folder-permissions.h | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/src/libekolab/kolab-data-folder-permissions.c b/src/libekolab/kolab-data-folder-permissions.c
index 0f2d05a..fd65572 100644
--- a/src/libekolab/kolab-data-folder-permissions.c
+++ b/src/libekolab/kolab-data-folder-permissions.c
@@ -58,14 +58,19 @@ kolab_data_folder_permissions_clone (const KolabDataFolderPermissions *srcdata,
data->acl = camel_imapx_acl_clone_list (srcdata->acl,
&tmp_err);
+ if (tmp_err != NULL)
+ goto exit;
+
+ data->myrights = camel_imapx_acl_clone_list (srcdata->myrights,
+ &tmp_err);
+
+ exit:
if (tmp_err != NULL) {
g_propagate_error (err, tmp_err);
- g_free (data);
+ kolab_data_folder_permissions_free (data);
return NULL;
}
- data->myrights = g_strdup (srcdata->myrights);
-
return data;
}
@@ -76,7 +81,7 @@ kolab_data_folder_permissions_free (KolabDataFolderPermissions *data)
return;
camel_imapx_acl_free_list (data->acl);
- g_free (data->myrights);
+ camel_imapx_acl_free_list (data->myrights);
g_free (data);
}
diff --git a/src/libekolab/kolab-data-folder-permissions.h b/src/libekolab/kolab-data-folder-permissions.h
index ac6cb6e..a3d3c8a 100644
--- a/src/libekolab/kolab-data-folder-permissions.h
+++ b/src/libekolab/kolab-data-folder-permissions.h
@@ -38,7 +38,7 @@
typedef struct _KolabDataFolderPermissions KolabDataFolderPermissions;
struct _KolabDataFolderPermissions {
GList *acl;
- gchar *myrights;
+ GList *myrights;
};
/*----------------------------------------------------------------------------*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]