Menu
▾
▴
[Opensync-commits] r1352 - in trunk: libsyncml libsyncml/data_sync_api tests
|
From: <svn...@op...> - 2009-11-09 16:10:50
|
Author: bellmich Date: Mon Nov 9 17:10:34 2009 New Revision: 1352 URL: http://libsyncml.opensync.org/changeset/1352 Log: made some popular content types public Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c trunk/libsyncml/data_sync_api/sml_data_sync_defines.h trunk/libsyncml/sml_defines.h trunk/libsyncml/sml_notification.c trunk/tests/check_devinf.c trunk/tests/check_ds.c trunk/tests/check_san.c trunk/tests/check_session.c trunk/tests/check_sync.c trunk/tests/check_wbxml_assembler.c trunk/tests/check_xml_assembler.c Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_devinf.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/libsyncml/data_sync_api/data_sync_devinf.c Mon Nov 9 17:10:34 2009 (r1352) @@ -24,6 +24,8 @@ #include "sml_data_sync_session_private.h" #include "sml_data_sync_data_store_private.h" +#include "sml_data_sync_defines.h" + #include "libsyncml/sml_support.h" #include "libsyncml/sml_error_internals.h" #include "../sml_defines.h" @@ -743,7 +745,7 @@ /* fix missing identifier */ if (!self->priv->local) { self->priv->local = sml_location_new(); - gchar *ident = sml_data_sync_dev_inf_get_identifier(); + const gchar *ident = sml_data_sync_dev_inf_get_identifier(); sml_location_set_uri(self->priv->local, ident); smlSafeCFree(&ident); } Modified: trunk/libsyncml/data_sync_api/sml_data_sync_defines.h ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_defines.h Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/libsyncml/data_sync_api/sml_data_sync_defines.h Mon Nov 9 17:10:34 2009 (r1352) @@ -123,6 +123,15 @@ #define SML_TRANSPORT_CONFIG_DATASTORE_CONTACT "CONTACT" #define SML_TRANSPORT_CONFIG_DATASTORE_NOTE "NOTE" +/* Well known content types */ + +#define SML_ELEMENT_TEXT_VCARD "text/x-vcard" +#define SML_ELEMENT_TEXT_VCARD_30 "text/vcard" +#define SML_ELEMENT_TEXT_VCAL "text/x-vcalendar" +#define SML_ELEMENT_TEXT_ICAL "text/calendar" +#define SML_ELEMENT_TEXT_PLAIN "text/plain" +#define SML_ELEMENT_TEXT_MESSAGE "text/x-vMessage" + #ifdef __cplusplus } #endif Modified: trunk/libsyncml/sml_defines.h ============================================================================== --- trunk/libsyncml/sml_defines.h Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/libsyncml/sml_defines.h Mon Nov 9 17:10:34 2009 (r1352) @@ -174,13 +174,6 @@ SML_DEVINF_CTCAP_MAXSIZE } SmlDevInfCTCapType; -#define SML_ELEMENT_TEXT_VCARD "text/x-vcard" -#define SML_ELEMENT_TEXT_VCARD_30 "text/vcard" -#define SML_ELEMENT_TEXT_VCAL "text/x-vcalendar" -#define SML_ELEMENT_TEXT_ICAL "text/calendar" -#define SML_ELEMENT_TEXT_PLAIN "text/plain" -#define SML_ELEMENT_TEXT_MESSAGE "text/x-vMessage" - #define SML_ELEMENT_DEVINF_XML "application/vnd.syncml-devinf+xml" #define SML_ELEMENT_WBXML "application/vnd.syncml+wbxml" #define SML_ELEMENT_XML "application/vnd.syncml+xml" Modified: trunk/libsyncml/sml_notification.c ============================================================================== --- trunk/libsyncml/sml_notification.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/libsyncml/sml_notification.c Mon Nov 9 17:10:34 2009 (r1352) @@ -28,6 +28,7 @@ #include "sml_md5.h" #include "data_sync_api/sml_location.h" +#include "data_sync_api/sml_data_sync_defines.h" SmlNotification* smlNotificationNew (SmlNotificationVersion version, Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_devinf.c Mon Nov 9 17:10:34 2009 (r1352) @@ -25,6 +25,7 @@ #include <libsyncml/objects/sml_devinf_obj.h> #include <libsyncml/data_sync_api/sml_location.h> #include "libsyncml/parser/sml_xml_parse.h" +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <string.h> #include <unistd.h> Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_ds.c Mon Nov 9 17:10:34 2009 (r1352) @@ -29,6 +29,7 @@ #include <libsyncml/sml_session_internals.h> #include <libsyncml/sml_elements_internals.h> #include <libsyncml/data_sync_api/sml_location.h> +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <string.h> #include <unistd.h> Modified: trunk/tests/check_san.c ============================================================================== --- trunk/tests/check_san.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_san.c Mon Nov 9 17:10:34 2009 (r1352) @@ -22,6 +22,7 @@ #include "tests/support.h" #include "libsyncml/sml_error_internals.h" #include "libsyncml/sml_notification_internals.h" +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> /* If the notification is a normal SyncML message then a manager is * required. The easiest way are two function which create and destroy Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_session.c Mon Nov 9 17:10:34 2009 (r1352) @@ -27,6 +27,7 @@ #include <libsyncml/sml_transport_internals.h> #include <libsyncml/objects/sml_auth.c> #include <libsyncml/data_sync_api/sml_location.h> +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <libsyncml/sml_notification.h> Modified: trunk/tests/check_sync.c ============================================================================== --- trunk/tests/check_sync.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_sync.c Mon Nov 9 17:10:34 2009 (r1352) @@ -27,6 +27,7 @@ #include <libsyncml/objects/sml_devinf_obj.h> #include <libsyncml/data_sync_api/sml_location.h> +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <libsyncml/sml_error_internals.h> Modified: trunk/tests/check_wbxml_assembler.c ============================================================================== --- trunk/tests/check_wbxml_assembler.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_wbxml_assembler.c Mon Nov 9 17:10:34 2009 (r1352) @@ -26,6 +26,7 @@ #include <libsyncml/sml_command_internals.h> #include <libsyncml/sml_elements_internals.h> #include <libsyncml/data_sync_api/sml_location.h> +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <libsyncml/sml_error_internals.h> static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Nov 9 17:09:42 2009 (r1351) +++ trunk/tests/check_xml_assembler.c Mon Nov 9 17:10:34 2009 (r1352) @@ -24,6 +24,7 @@ #include <libsyncml/sml_elements_internals.h> #include <libsyncml/data_sync_api/sml_location.h> #include <libsyncml/data_sync_api/sml_data_sync_change_item_internals.h> +#include <libsyncml/data_sync_api/sml_data_sync_defines.h> #include <libsyncml/sml_error_internals.h> static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) |
