Menu
▾
▴
[Opensync-commits] r1117 - in trunk: libsyncml libsyncml/dev_inf_api libsyncml/parser tests
|
From: <svn...@op...> - 2009-06-24 09:55:12
|
Author: bellmich Date: Wed Jun 24 11:54:05 2009 New Revision: 1117 URL: http://libsyncml.opensync.org/changeset/1117 Log: The property is called SupportHierarchicalSync in the OMA specficiations. Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.c trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.h trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_devinf.h trunk/tests/check_dev_inf_data_store.c Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.c Tue Jun 23 17:37:11 2009 (r1116) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.c Wed Jun 24 11:54:05 2009 (r1117) @@ -38,7 +38,7 @@ PROP_MAX_MEM, PROP_SHARED_MEM, PROP_SYNC_CAP, - PROP_SUPPORTS_HIERARCHICAL_SYNC + PROP_SUPPORT_HIERARCHICAL_SYNC }; struct _SmlDevInfDataStorePrivate @@ -54,7 +54,7 @@ gsize max_mem; gboolean shared_mem; guint32 sync_cap; - gboolean supports_hierarchical_sync; + gboolean support_hierarchical_sync; }; static void @@ -97,8 +97,8 @@ case PROP_SYNC_CAP: g_value_set_uint (value, SML_DEV_INF_DATA_STORE (object)->priv->sync_cap); break; - case PROP_SUPPORTS_HIERARCHICAL_SYNC: - g_value_set_boolean (value, SML_DEV_INF_DATA_STORE (object)->priv->supports_hierarchical_sync); + case PROP_SUPPORT_HIERARCHICAL_SYNC: + g_value_set_boolean (value, SML_DEV_INF_DATA_STORE (object)->priv->support_hierarchical_sync); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -151,8 +151,8 @@ case PROP_SYNC_CAP: SML_DEV_INF_DATA_STORE (object)->priv->sync_cap = g_value_get_uint (value); break; - case PROP_SUPPORTS_HIERARCHICAL_SYNC: - SML_DEV_INF_DATA_STORE (object)->priv->supports_hierarchical_sync = g_value_get_boolean (value); + case PROP_SUPPORT_HIERARCHICAL_SYNC: + SML_DEV_INF_DATA_STORE (object)->priv->support_hierarchical_sync = g_value_get_boolean (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -340,7 +340,7 @@ * The SupportsHierarchicalSync property. */ g_object_class_install_property (object_class, - PROP_SUPPORTS_HIERARCHICAL_SYNC, + PROP_SUPPORT_HIERARCHICAL_SYNC, g_param_spec_boolean ("SupportsHierarchicalSync", "", "If this property is set true then hierarchical sync is supported.", @@ -817,7 +817,7 @@ } /** - * sml_dev_inf_data_store_get_supports_hierarchical_sync: + * sml_dev_inf_data_store_get_support_hierarchical_sync: * @self: A #SmlDevInfDataStore * * Gets the property. @@ -825,25 +825,25 @@ * Return value: */ gboolean -sml_dev_inf_data_store_get_supports_hierarchical_sync (SmlDevInfDataStore *self) +sml_dev_inf_data_store_get_support_hierarchical_sync (SmlDevInfDataStore *self) { g_return_val_if_fail (SML_IS_DEV_INF_DATA_STORE (self), FALSE); - return self->priv->supports_hierarchical_sync; + return self->priv->support_hierarchical_sync; } /** - * sml_dev_inf_data_store_set_supports_hierarchical_sync: + * sml_dev_inf_data_store_set_support_hierarchical_sync: * @self: A #SmlDevInfDataStore * @sharedmem: * * Sets the property. */ void -sml_dev_inf_data_store_set_supports_hierarchical_sync (SmlDevInfDataStore *self, +sml_dev_inf_data_store_set_support_hierarchical_sync (SmlDevInfDataStore *self, gboolean supported) { g_return_if_fail (SML_IS_DEV_INF_DATA_STORE (self)); - self->priv->supports_hierarchical_sync = supported; + self->priv->support_hierarchical_sync = supported; } /** Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.h ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.h Tue Jun 23 17:37:11 2009 (r1116) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_data_store.h Wed Jun 24 11:54:05 2009 (r1117) @@ -88,8 +88,8 @@ gboolean sml_dev_inf_data_store_add_tx (SmlDevInfDataStore *self, SmlDevInfContentType *ct, GError **error); gboolean sml_dev_inf_data_store_get_sync_cap (SmlDevInfDataStore *self, SmlDevInfSyncCap sync_cap); void sml_dev_inf_data_store_set_sync_cap (SmlDevInfDataStore *self, SmlDevInfSyncCap sync_cap, gboolean supported); -gboolean sml_dev_inf_data_store_get_supports_hierarchical_sync (SmlDevInfDataStore *self); -void sml_dev_inf_data_store_set_supports_hierarchical_sync (SmlDevInfDataStore *self, gboolean supported); +gboolean sml_dev_inf_data_store_get_support_hierarchical_sync (SmlDevInfDataStore *self); +void sml_dev_inf_data_store_set_support_hierarchical_sync (SmlDevInfDataStore *self, gboolean supported); gboolean sml_dev_inf_data_store_is_compliant (SmlDevInfDataStore *self, GError **error); G_END_DECLS Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Tue Jun 23 17:37:11 2009 (r1116) +++ trunk/libsyncml/parser/sml_xml_parse.c Wed Jun 24 11:54:05 2009 (r1117) @@ -3388,7 +3388,7 @@ smlErrorSet(error, SML_ERROR_GENERIC, "SupportHierarchicalSync is only supported in OMA DS 1.2 DevInf and later."); goto error; } - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, TRUE); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, TRUE); if (!xmlTextReaderIsEmptyElement(parser->reader)) { if (!_smlXmlParserStep(parser)) { smlErrorSet(error, SML_ERROR_GENERIC, "The closing element of %s is missing.", SML_ELEMENT_SUPPORT_HIERARCHICAL_SYNC); Modified: trunk/libsyncml/sml_devinf.h ============================================================================== --- trunk/libsyncml/sml_devinf.h Tue Jun 23 17:37:11 2009 (r1116) +++ trunk/libsyncml/sml_devinf.h Wed Jun 24 11:54:05 2009 (r1117) @@ -70,33 +70,6 @@ unsigned int smlDevInfNumDataStores(SmlDevInf *devinf); const SmlDevInfDataStore *smlDevInfGetNthDataStore(const SmlDevInf *devinf, unsigned int nth); -//SmlDevInfDataStore *smlDevInfDataStoreNew(const char *sourceRef, SmlError **error); -//SmlDevInfDataStore *smlDevInfDataStoreRef(SmlDevInfDataStore *datastore); -//void smlDevInfDataStoreUnref(SmlDevInfDataStore *datastore); -// -//const char *smlDevInfDataStoreGetSourceRef(const SmlDevInfDataStore *datastore); -//void smlDevInfDataStoreSetSourceRef(SmlDevInfDataStore *datastore, const char *sourceref); -//const char *smlDevInfDataStoreGetDisplayName(const SmlDevInfDataStore *datastore); -//void smlDevInfDataStoreSetDisplayName(SmlDevInfDataStore *datastore, const char *displayName); -//unsigned int smlDevInfGetMaxGUIDSize(const SmlDevInfDataStore *datastore); -//void smlDevInfSetMaxGUIDSize(SmlDevInfDataStore *datastore, unsigned int max); -// -//void smlDevInfDataStoreSetRxPref(SmlDevInfDataStore *datastore, const char *contenttype, const char *version); -//SmlBool smlDevInfDataStoreGetRxPref(const SmlDevInfDataStore *datastore, char **contenttype, char **version); -//void smlDevInfDataStoreAddRx(SmlDevInfDataStore *datastore, SmlDevInfContentType *ct); -//unsigned int smlDevInfDataStoreNumRx(const SmlDevInfDataStore *datastore); -//const SmlDevInfContentType *smlDevInfDataStoreGetNthRx(const SmlDevInfDataStore *datastore, unsigned int n); -//void smlDevInfDataStoreSetTxPref(SmlDevInfDataStore *datastore, const char *contenttype, const char *version); -//SmlBool smlDevInfDataStoreGetTxPref(const SmlDevInfDataStore *datastore, char **contenttype, char **version); -//void smlDevInfDataStoreAddTx(SmlDevInfDataStore *datastore, SmlDevInfContentType *ct); -//unsigned int smlDevInfDataStoreNumTx(const SmlDevInfDataStore *datastore); -//const SmlDevInfContentType *smlDevInfDataStoreGetNthTx(const SmlDevInfDataStore *datastore, unsigned int n); -// -//void smlDevInfDataStoreSetMemory(SmlDevInfDataStore *datastore, SmlBool shared, unsigned int maxid, unsigned int maxmem); -//void smlDevInfDataStoreGetMemory(const SmlDevInfDataStore *datastore, SmlBool *shared, unsigned int *maxid, unsigned int *maxmem); -//void smlDevInfDataStoreSetSyncCap(SmlDevInfDataStore *datastore, SmlDevInfSyncCap cap, SmlBool supported); -//SmlBool smlDevInfDataStoreGetSyncCap(const SmlDevInfDataStore *datastore, SmlDevInfSyncCap cap); - SmlBool smlDevInfAssemble(SmlDevInf *devinf, char **data, unsigned int *size, SmlError **error); SmlCommand *smlDevInfNewResult(SmlCommand *cmd, SmlDevInf *devinf, SmlDevInfVersion version, SmlError **error); SmlCommand *smlDevInfNewPut(SmlDevInf *devinf, SmlDevInfVersion version, SmlError **error); Modified: trunk/tests/check_dev_inf_data_store.c ============================================================================== --- trunk/tests/check_dev_inf_data_store.c Tue Jun 23 17:37:11 2009 (r1116) +++ trunk/tests/check_dev_inf_data_store.c Wed Jun 24 11:54:05 2009 (r1117) @@ -64,8 +64,8 @@ sml_fail_unless(sml_dev_inf_data_store_set_display_name(datastore, NULL, &error), "%s", error?error->message:"No GError set."); sml_dev_inf_data_store_set_max_guid_size(datastore, 0); sml_dev_inf_data_store_set_max_id(datastore, 0); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, TRUE); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, FALSE); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, TRUE); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, FALSE); /* The unknown SyncCap removes all configured SyncCaps. */ @@ -135,11 +135,11 @@ sml_dev_inf_data_store_set_max_id(datastore, 0); sml_fail_unless(sml_dev_inf_data_store_get_max_id(datastore) == 0, "The default MaxID was overwritten"); - sml_fail_unless(sml_dev_inf_data_store_get_supports_hierarchical_sync(datastore) == FALSE, "The default SupportsHierarchicalSync is FALSE."); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, TRUE); - sml_fail_unless(sml_dev_inf_data_store_get_supports_hierarchical_sync(datastore) == TRUE, "SupportsHierarchicalSync must be TRUE."); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, FALSE); - sml_fail_unless(sml_dev_inf_data_store_get_supports_hierarchical_sync(datastore) == FALSE, "SupportsHierarchicalSync must be FALSE."); + sml_fail_unless(sml_dev_inf_data_store_get_support_hierarchical_sync(datastore) == FALSE, "The default SupportsHierarchicalSync is FALSE."); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, TRUE); + sml_fail_unless(sml_dev_inf_data_store_get_support_hierarchical_sync(datastore) == TRUE, "SupportsHierarchicalSync must be TRUE."); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, FALSE); + sml_fail_unless(sml_dev_inf_data_store_get_support_hierarchical_sync(datastore) == FALSE, "SupportsHierarchicalSync must be FALSE."); /* The unknown SyncCap is set if no other SynCap is set. */ @@ -242,8 +242,8 @@ sml_dev_inf_data_store_set_max_id(datastore, 1000000000); sml_dev_inf_data_store_set_max_id(datastore, 0); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, TRUE); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, FALSE); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, TRUE); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, FALSE); /* The unknown SyncCap is set if no other SynCap is set. */ @@ -322,10 +322,10 @@ sml_dev_inf_data_store_set_max_id(datastore, 0); sml_fail_unless(sml_dev_inf_data_store_get_max_id(datastore) == 0, "The MaxID was not copied correctly."); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, TRUE); - sml_fail_unless(sml_dev_inf_data_store_get_supports_hierarchical_sync(datastore) == TRUE, "SupportsHierarchicalSync must be TRUE."); - sml_dev_inf_data_store_set_supports_hierarchical_sync(datastore, FALSE); - sml_fail_unless(sml_dev_inf_data_store_get_supports_hierarchical_sync(datastore) == FALSE, "SupportsHierarchicalSync must be FALSE."); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, TRUE); + sml_fail_unless(sml_dev_inf_data_store_get_support_hierarchical_sync(datastore) == TRUE, "SupportsHierarchicalSync must be TRUE."); + sml_dev_inf_data_store_set_support_hierarchical_sync(datastore, FALSE); + sml_fail_unless(sml_dev_inf_data_store_get_support_hierarchical_sync(datastore) == FALSE, "SupportsHierarchicalSync must be FALSE."); /* The unknown SyncCap is set if no other SynCap is set. */ |
