[evolution-kolab] KolabDataFolderMetadata: added a KolabSyncStrategyID member
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] KolabDataFolderMetadata: added a KolabSyncStrategyID member
- Date: Fri, 19 Oct 2012 18:27:08 +0000 (UTC)
commit f84b4a9a7c64071d60be1ecd266d1047a2805356
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Fri Oct 19 19:07:00 2012 +0200
KolabDataFolderMetadata: added a KolabSyncStrategyID member
* used for keeping the conflict resolution strategy
for a folder (read from the ESource and written
back to it if changed)
src/libekolab/kolab-data-folder-metadata.c | 1 +
src/libekolab/kolab-data-folder-metadata.h | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/libekolab/kolab-data-folder-metadata.c b/src/libekolab/kolab-data-folder-metadata.c
index 34a4313..91d8a98 100644
--- a/src/libekolab/kolab-data-folder-metadata.c
+++ b/src/libekolab/kolab-data-folder-metadata.c
@@ -40,6 +40,7 @@ kolab_data_folder_metadata_new (void)
data->foldername = NULL;
data->foldertype = KOLAB_FOLDER_TYPE_INVAL;
data->show_all = FALSE;
+ data->strategy = KOLAB_SYNC_STRATEGY_DEFAULT;
return data;
}
diff --git a/src/libekolab/kolab-data-folder-metadata.h b/src/libekolab/kolab-data-folder-metadata.h
index 2e9b9ab..62dbb79 100644
--- a/src/libekolab/kolab-data-folder-metadata.h
+++ b/src/libekolab/kolab-data-folder-metadata.h
@@ -35,12 +35,15 @@
#include <libekolabutil/kolab-util-folder.h>
+#include "kolab-types.h"
+
/*----------------------------------------------------------------------------*/
typedef struct _KolabDataFolderMetadata KolabDataFolderMetadata;
struct _KolabDataFolderMetadata {
gchar *foldername;
KolabFolderTypeID foldertype;
+ KolabSyncStrategyID strategy;
gboolean show_all; /* whether to unhide PIM folders */
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]