opensync.h   opensync.h 
skipping to change at line 27 skipping to change at line 27
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef HAVE_OPENSYNC_H #ifndef HAVE_OPENSYNC_H
#define HAVE_OPENSYNC_H #define HAVE_OPENSYNC_H
#include <sys/types.h> #include <sys/types.h>
#include <time.h> #include <time.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
#define OPENSYNC_BEGIN_DECLS extern "C" { #define OPENSYNC_BEGIN_DECLS extern "C" {
#define OPENSYNC_END_DECLS } #define OPENSYNC_END_DECLS }
#else #else
#define OPENSYNC_BEGIN_DECLS #define OPENSYNC_BEGIN_DECLS
#define OPENSYNC_END_DECLS #define OPENSYNC_END_DECLS
skipping to change at line 84 skipping to change at line 85
* Defines * Defines
*************************************************************/ *************************************************************/
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
#ifndef FALSE #ifndef FALSE
#define FALSE 0 #define FALSE 0
#endif #endif
#ifndef NDEBUG
#define osync_assert(x) if (!(x)) { fprintf(stderr, "%s:%i:E:%s: Assertion
\"" #x "\" failed\n", __FILE__, __LINE__, __func__); abort();}
#define osync_assert_msg(x, msg) if (!(x)) { fprintf(stderr, "%s:%i:E:%s: %
s\n", __FILE__, __LINE__, __func__, msg); abort();}
#define segfault_me char **blablabla = NULL; *blablabla = "test";
#else
#define osync_assert(x)
#define osync_assert_msg(x, msg)
#define segfault_me
#endif
/************************************************************** /**************************************************************
* Enums * Enums
*************************************************************/ *************************************************************/
typedef enum { typedef enum {
OSYNC_START_TYPE_UNKNOWN, OSYNC_START_TYPE_UNKNOWN,
OSYNC_START_TYPE_PROCESS, OSYNC_START_TYPE_PROCESS,
OSYNC_START_TYPE_THREAD, OSYNC_START_TYPE_THREAD,
OSYNC_START_TYPE_EXTERNAL OSYNC_START_TYPE_EXTERNAL
} OSyncStartType; } OSyncStartType;
 End of changes. 2 change blocks. 
0 lines changed or deleted 13 lines changed or added


 opensync_converter.h   opensync_converter.h 
skipping to change at line 35 skipping to change at line 35
/** Simple converter */ /** Simple converter */
OSYNC_CONVERTER_CONV = 1, OSYNC_CONVERTER_CONV = 1,
/** Encapsulator */ /** Encapsulator */
OSYNC_CONVERTER_ENCAP = 2, OSYNC_CONVERTER_ENCAP = 2,
/** Desencapsulator */ /** Desencapsulator */
OSYNC_CONVERTER_DECAP = 3, OSYNC_CONVERTER_DECAP = 3,
/** Detector */ /** Detector */
OSYNC_CONVERTER_DETECTOR = 4 OSYNC_CONVERTER_DETECTOR = 4
} OSyncConverterType; } OSyncConverterType;
typedef osync_bool (* OSyncFormatDetectFunc) (const char *data, int size); typedef osync_bool (* OSyncFormatDetectFunc) (const char *data, int size, v
typedef osync_bool (* OSyncFormatConvertFunc) (char *input, unsigned int in oid *userdata);
psize, char **output, unsigned int *outpsize, osync_bool *free_input, const typedef osync_bool (* OSyncFormatConvertFunc) (char *input, unsigned int in
char *config, OSyncError **error); psize, char **output, unsigned int *outpsize, osync_bool *free_input, const
char *config, void *userdata, OSyncError **error);
typedef void * (* OSyncFormatConverterInitializeFunc) (const char *config,
OSyncError **error);
typedef void (* OSyncFormatConverterFinalizeFunc) (void *userdata);
OSYNC_EXPORT OSyncFormatConverter *osync_converter_new(OSyncConverterType t ype, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSyncForma tConvertFunc convert_func, OSyncError **error); OSYNC_EXPORT OSyncFormatConverter *osync_converter_new(OSyncConverterType t ype, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSyncForma tConvertFunc convert_func, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverter *osync_converter_new_detector(OSyncObjFor mat *sourceformat, OSyncObjFormat *targetformat, OSyncFormatDetectFunc dete ct_func, OSyncError **error); OSYNC_EXPORT OSyncFormatConverter *osync_converter_new_detector(OSyncObjFor mat *sourceformat, OSyncObjFormat *targetformat, OSyncFormatDetectFunc dete ct_func, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverter *osync_converter_ref(OSyncFormatConverter *converter); OSYNC_EXPORT OSyncFormatConverter *osync_converter_ref(OSyncFormatConverter *converter);
OSYNC_EXPORT void osync_converter_unref(OSyncFormatConverter *converter); OSYNC_EXPORT void osync_converter_unref(OSyncFormatConverter *converter);
OSYNC_EXPORT OSyncObjFormat *osync_converter_get_sourceformat(OSyncFormatCo nverter *converter); OSYNC_EXPORT OSyncObjFormat *osync_converter_get_sourceformat(OSyncFormatCo nverter *converter);
OSYNC_EXPORT OSyncObjFormat *osync_converter_get_targetformat(OSyncFormatCo nverter *converter); OSYNC_EXPORT OSyncObjFormat *osync_converter_get_targetformat(OSyncFormatCo nverter *converter);
OSYNC_EXPORT OSyncConverterType osync_converter_get_type(OSyncFormatConvert er *converter); OSYNC_EXPORT OSyncConverterType osync_converter_get_type(OSyncFormatConvert er *converter);
skipping to change at line 61 skipping to change at line 63
OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_new(OSyncError **error); OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_new(OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_ref(OSyncFormat ConverterPath *path); OSYNC_EXPORT OSyncFormatConverterPath *osync_converter_path_ref(OSyncFormat ConverterPath *path);
OSYNC_EXPORT void osync_converter_path_unref(OSyncFormatConverterPath *path ); OSYNC_EXPORT void osync_converter_path_unref(OSyncFormatConverterPath *path );
OSYNC_EXPORT void osync_converter_path_add_edge(OSyncFormatConverterPath *p ath, OSyncFormatConverter *edge); OSYNC_EXPORT void osync_converter_path_add_edge(OSyncFormatConverterPath *p ath, OSyncFormatConverter *edge);
OSYNC_EXPORT unsigned int osync_converter_path_num_edges(OSyncFormatConvert erPath *path); OSYNC_EXPORT unsigned int osync_converter_path_num_edges(OSyncFormatConvert erPath *path);
OSYNC_EXPORT OSyncFormatConverter *osync_converter_path_nth_edge(OSyncForma tConverterPath *path, unsigned int nth); OSYNC_EXPORT OSyncFormatConverter *osync_converter_path_nth_edge(OSyncForma tConverterPath *path, unsigned int nth);
OSYNC_EXPORT const char *osync_converter_path_get_config(OSyncFormatConvert erPath *path); OSYNC_EXPORT const char *osync_converter_path_get_config(OSyncFormatConvert erPath *path);
OSYNC_EXPORT void osync_converter_path_set_config(OSyncFormatConverterPath *path, const char *config); OSYNC_EXPORT void osync_converter_path_set_config(OSyncFormatConverterPath *path, const char *config);
OSYNC_EXPORT void osync_converter_set_initialize_func(OSyncFormatConverter
*converter, OSyncFormatConverterInitializeFunc initialize_func);
OSYNC_EXPORT void osync_converter_set_finalize_func(OSyncFormatConverter *c
onverter, OSyncFormatConverterFinalizeFunc finalize_func);
OSYNC_EXPORT void osync_converter_initialize(OSyncFormatConverter *converte
r, const char *config, OSyncError **error);
OSYNC_EXPORT void osync_converter_finalize(OSyncFormatConverter *converter)
;
#endif //_OPENSYNC_CONVERTER_H_ #endif //_OPENSYNC_CONVERTER_H_
 End of changes. 2 change blocks. 
4 lines changed or deleted 17 lines changed or added


 opensync_format_env.h   opensync_format_env.h 
skipping to change at line 53 skipping to change at line 53
OSYNC_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth); OSYNC_EXPORT OSyncCustomFilter *osync_format_env_nth_filter(OSyncFormatEnv *env, int nth);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat(OSyncFormatE nv *env, OSyncData *data); OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat(OSyncFormatE nv *env, OSyncData *data);
OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat_full(OSyncFo rmatEnv *env, OSyncData *input, OSyncError **error); OSYNC_EXPORT OSyncObjFormat *osync_format_env_detect_objformat_full(OSyncFo rmatEnv *env, OSyncData *input, OSyncError **error);
OSYNC_EXPORT osync_bool osync_format_env_convert(OSyncFormatEnv *env, OSync FormatConverterPath *path, OSyncData *data, OSyncError **error); OSYNC_EXPORT osync_bool osync_format_env_convert(OSyncFormatEnv *env, OSync FormatConverterPath *path, OSyncData *data, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path(OSyncForm atEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSy ncError **error); OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path(OSyncForm atEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat, OSy ncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats(O SyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncList *targets, OSync Error **error); OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats(O SyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncList *targets, OSync Error **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_with_dete OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_with_dete
ctors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncObjFormat *targetfor ctors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncObjFormat *targetfor
mat, OSyncError **error); mat, const char *preferred_format, OSyncError **error);
OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats_w OSYNC_EXPORT OSyncFormatConverterPath *osync_format_env_find_path_formats_w
ith_detectors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncList *target ith_detectors(OSyncFormatEnv *env, OSyncData *sourcedata, OSyncList *target
s, OSyncError **error); s, const char *preferred_format, OSyncError **error);
#endif //_OPENSYNC_FORMAT_ENV_H_ #endif //_OPENSYNC_FORMAT_ENV_H_
 End of changes. 1 change blocks. 
6 lines changed or deleted 6 lines changed or added


 opensync_plugin_advancedoptions.h   opensync_plugin_advancedoptions.h 
skipping to change at line 53 skipping to change at line 53
OSYNC_EXPORT void osync_plugin_advancedoption_unref(OSyncPluginAdvancedOpti on *option); OSYNC_EXPORT void osync_plugin_advancedoption_unref(OSyncPluginAdvancedOpti on *option);
OSYNC_EXPORT OSyncPluginAdvancedOption *osync_plugin_advancedoption_ref(OSy ncPluginAdvancedOption *option); OSYNC_EXPORT OSyncPluginAdvancedOption *osync_plugin_advancedoption_ref(OSy ncPluginAdvancedOption *option);
OSYNC_EXPORT OSyncList *osync_plugin_advancedoption_get_parameters(OSyncPlu ginAdvancedOption *option); OSYNC_EXPORT OSyncList *osync_plugin_advancedoption_get_parameters(OSyncPlu ginAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_add_parameter(OSyncPluginAdva ncedOption *option, OSyncPluginAdvancedOptionParameter *param); OSYNC_EXPORT void osync_plugin_advancedoption_add_parameter(OSyncPluginAdva ncedOption *option, OSyncPluginAdvancedOptionParameter *param);
OSYNC_EXPORT void osync_plugin_advancedoption_remove_parameter(OSyncPluginA dvancedOption *option, OSyncPluginAdvancedOptionParameter *param); OSYNC_EXPORT void osync_plugin_advancedoption_remove_parameter(OSyncPluginA dvancedOption *option, OSyncPluginAdvancedOptionParameter *param);
OSYNC_EXPORT unsigned int osync_plugin_advancedoption_get_maxsize(OSyncPlug inAdvancedOption *option); OSYNC_EXPORT unsigned int osync_plugin_advancedoption_get_maxsize(OSyncPlug inAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_set_maxsize(OSyncPluginAdvanc edOption *option, unsigned int maxsize); OSYNC_EXPORT void osync_plugin_advancedoption_set_maxsize(OSyncPluginAdvanc edOption *option, unsigned int maxsize);
OSYNC_EXPORT unsigned int osync_plugin_advancedoption_get_minsize(OSyncPlug
inAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_set_minsize(OSyncPluginAdvanc
edOption *option, unsigned int minsize);
OSYNC_EXPORT unsigned int osync_plugin_advancedoption_get_maxoccurs(OSyncPl uginAdvancedOption *option); OSYNC_EXPORT unsigned int osync_plugin_advancedoption_get_maxoccurs(OSyncPl uginAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_set_maxoccurs(OSyncPluginAdva ncedOption *option, unsigned int maxoccurs); OSYNC_EXPORT void osync_plugin_advancedoption_set_maxoccurs(OSyncPluginAdva ncedOption *option, unsigned int maxoccurs);
OSYNC_EXPORT const char *osync_plugin_advancedoption_get_displayname(OSyncP luginAdvancedOption *option); OSYNC_EXPORT const char *osync_plugin_advancedoption_get_displayname(OSyncP luginAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_set_displayname(OSyncPluginAd vancedOption *option, const char *displayname); OSYNC_EXPORT void osync_plugin_advancedoption_set_displayname(OSyncPluginAd vancedOption *option, const char *displayname);
OSYNC_EXPORT const char *osync_plugin_advancedoption_get_name(OSyncPluginAd vancedOption *option); OSYNC_EXPORT const char *osync_plugin_advancedoption_get_name(OSyncPluginAd vancedOption *option);
OSYNC_EXPORT void osync_plugin_advancedoption_set_name(OSyncPluginAdvancedO ption *option, const char *name); OSYNC_EXPORT void osync_plugin_advancedoption_set_name(OSyncPluginAdvancedO ption *option, const char *name);
OSYNC_EXPORT OSyncPluginAdvancedOptionType osync_plugin_advancedoption_get_ type(OSyncPluginAdvancedOption *option); OSYNC_EXPORT OSyncPluginAdvancedOptionType osync_plugin_advancedoption_get_ type(OSyncPluginAdvancedOption *option);
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 opensync_plugin_authentication.h   opensync_plugin_authentication.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_PLUGIN_AUTHENTICATON_H_ #ifndef _OPENSYNC_PLUGIN_AUTHENTICATON_H_
#define _OPENSYNC_PLUGIN_AUTHENTICATON_H_ #define _OPENSYNC_PLUGIN_AUTHENTICATON_H_
typedef enum {
OSYNC_PLUGIN_AUTHENTICATION_USERNAME = (1 << 0),
OSYNC_PLUGIN_AUTHENTICATION_PASSWORD = (1 << 1),
OSYNC_PLUGIN_AUTHENTICATION_REFERENCE = (1 << 2),
} OSyncPluginAuthenticationOptionSupportedFlag;
typedef unsigned int OSyncPluginAuthenticationOptionSupportedFlags;
OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_authentication_new(OSy ncError **error); OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_authentication_new(OSy ncError **error);
OSYNC_EXPORT void osync_plugin_authentication_unref(OSyncPluginAuthenticati on *auth); OSYNC_EXPORT void osync_plugin_authentication_unref(OSyncPluginAuthenticati on *auth);
OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_authentication_ref(OSy ncPluginAuthentication *auth); OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_authentication_ref(OSy ncPluginAuthentication *auth);
OSYNC_EXPORT osync_bool osync_plugin_authentication_option_is_supported(OSy
ncPluginAuthentication *auth, OSyncPluginAuthenticationOptionSupportedFlag
flag);
OSYNC_EXPORT void osync_plugin_authentication_option_set_supported(OSyncPlu
ginAuthentication *auth, OSyncPluginAuthenticationOptionSupportedFlags flag
s);
OSYNC_EXPORT const char *osync_plugin_authentication_get_username(OSyncPlug inAuthentication *auth); OSYNC_EXPORT const char *osync_plugin_authentication_get_username(OSyncPlug inAuthentication *auth);
OSYNC_EXPORT void osync_plugin_authentication_set_username(OSyncPluginAuthe ntication *auth, const char *username); OSYNC_EXPORT void osync_plugin_authentication_set_username(OSyncPluginAuthe ntication *auth, const char *username);
OSYNC_EXPORT const char *osync_plugin_authentication_get_password(OSyncPlug inAuthentication *auth); OSYNC_EXPORT const char *osync_plugin_authentication_get_password(OSyncPlug inAuthentication *auth);
OSYNC_EXPORT void osync_plugin_authentication_set_password(OSyncPluginAuthe ntication *auth, const char *password); OSYNC_EXPORT void osync_plugin_authentication_set_password(OSyncPluginAuthe ntication *auth, const char *password);
OSYNC_EXPORT const char *osync_plugin_authentication_get_reference(OSyncPlu ginAuthentication *auth); OSYNC_EXPORT const char *osync_plugin_authentication_get_reference(OSyncPlu ginAuthentication *auth);
OSYNC_EXPORT void osync_plugin_authentication_set_reference(OSyncPluginAuth entication *auth, const char *reference); OSYNC_EXPORT void osync_plugin_authentication_set_reference(OSyncPluginAuth entication *auth, const char *reference);
#endif /*_OPENSYNC_PLUGIN_AUTHENTICATON_H_*/ #endif /*_OPENSYNC_PLUGIN_AUTHENTICATON_H_*/
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 opensync_plugin_config.h   opensync_plugin_config.h 
skipping to change at line 26 skipping to change at line 26
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_PLUGIN_CONFIG_H_ #ifndef _OPENSYNC_PLUGIN_CONFIG_H_
#define _OPENSYNC_PLUGIN_CONFIG_H_ #define _OPENSYNC_PLUGIN_CONFIG_H_
#include <opensync/opensync_list.h> #include <opensync/opensync_list.h>
typedef enum {
OPENSYNC_PLUGIN_CONFIG_ADVANCEDOPTION = (1 << 0),
OPENSYNC_PLUGIN_CONFIG_AUTHENTICATION = (1 << 1),
OPENSYNC_PLUGIN_CONFIG_LOCALIZATION = (1 << 2),
OPENSYNC_PLUGIN_CONFIG_RESOURCES = (1 << 3),
OPENSYNC_PLUGIN_CONFIG_CONNECTION = (1 << 4)
} OSyncPluginConfigSupportedFlag;
typedef unsigned int OSyncPluginConfigSupportedFlags;
OSYNC_EXPORT OSyncPluginConfig *osync_plugin_config_new(OSyncError **error) ; OSYNC_EXPORT OSyncPluginConfig *osync_plugin_config_new(OSyncError **error) ;
OSYNC_EXPORT void osync_plugin_config_unref(OSyncPluginConfig *config); OSYNC_EXPORT void osync_plugin_config_unref(OSyncPluginConfig *config);
OSYNC_EXPORT OSyncPluginConfig *osync_plugin_config_ref(OSyncPluginConfig * config); OSYNC_EXPORT OSyncPluginConfig *osync_plugin_config_ref(OSyncPluginConfig * config);
OSYNC_EXPORT osync_bool osync_plugin_config_file_load(OSyncPluginConfig *co nfig, const char *path, const char *schemadir, OSyncError **error); OSYNC_EXPORT osync_bool osync_plugin_config_file_load(OSyncPluginConfig *co nfig, const char *path, const char *schemadir, OSyncError **error);
OSYNC_EXPORT osync_bool osync_plugin_config_file_save(OSyncPluginConfig *co nfig, const char *path, OSyncError **error); OSYNC_EXPORT osync_bool osync_plugin_config_file_save(OSyncPluginConfig *co nfig, const char *path, OSyncError **error);
OSYNC_EXPORT osync_bool osync_plugin_config_is_supported(OSyncPluginConfig
*config, OSyncPluginConfigSupportedFlag flag);
OSYNC_EXPORT void osync_plugin_config_set_supported(OSyncPluginConfig *conf
ig, OSyncPluginConfigSupportedFlags flags);
/* Advanced Options */ /* Advanced Options */
OSYNC_EXPORT OSyncList *osync_plugin_config_get_advancedoptions(OSyncPlugin Config *config); OSYNC_EXPORT OSyncList *osync_plugin_config_get_advancedoptions(OSyncPlugin Config *config);
OSYNC_EXPORT OSyncPluginAdvancedOption *osync_plugin_config_get_advancedopt ion_value_by_name(OSyncPluginConfig *config, const char *name); OSYNC_EXPORT OSyncPluginAdvancedOption *osync_plugin_config_get_advancedopt ion_value_by_name(OSyncPluginConfig *config, const char *name);
OSYNC_EXPORT void osync_plugin_config_add_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option); OSYNC_EXPORT void osync_plugin_config_add_advancedoption(OSyncPluginConfig *config, OSyncPluginAdvancedOption *option);
OSYNC_EXPORT void osync_plugin_config_remove_advancedoption(OSyncPluginConf ig *config, OSyncPluginAdvancedOption *option); OSYNC_EXPORT void osync_plugin_config_remove_advancedoption(OSyncPluginConf ig *config, OSyncPluginAdvancedOption *option);
/* Authentication */ /* Authentication */
OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_config_get_authenticat ion(OSyncPluginConfig *config); OSYNC_EXPORT OSyncPluginAuthentication *osync_plugin_config_get_authenticat ion(OSyncPluginConfig *config);
OSYNC_EXPORT void osync_plugin_config_set_authentication(OSyncPluginConfig *config, OSyncPluginAuthentication *authentication); OSYNC_EXPORT void osync_plugin_config_set_authentication(OSyncPluginConfig *config, OSyncPluginAuthentication *authentication);
/* Localization */ /* Localization */
OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_config_get_localization( OSyncPluginConfig *config); OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_config_get_localization( OSyncPluginConfig *config);
OSYNC_EXPORT void osync_plugin_config_set_localization(OSyncPluginConfig *c onfig, OSyncPluginLocalization *localization); OSYNC_EXPORT void osync_plugin_config_set_localization(OSyncPluginConfig *c onfig, OSyncPluginLocalization *localization);
/* Resources */ /* Resources */
OSYNC_EXPORT OSyncList *osync_plugin_config_get_resources(OSyncPluginConfig *plugin); OSYNC_EXPORT OSyncList *osync_plugin_config_get_resources(OSyncPluginConfig *plugin);
OSYNC_EXPORT OSyncPluginResource *osync_plugin_config_find_active_resource( OSyncPluginConfig *config, const char *objtype); OSYNC_EXPORT OSyncPluginResource *osync_plugin_config_find_active_resource( OSyncPluginConfig *config, const char *objtype);
OSYNC_EXPORT void osync_plugin_config_add_resource(OSyncPluginConfig *plugi n, OSyncPluginResource *resource); OSYNC_EXPORT void osync_plugin_config_add_resource(OSyncPluginConfig *plugi n, OSyncPluginResource *resource);
OSYNC_EXPORT void osync_plugin_config_remove_resource(OSyncPluginConfig *pl ugin, OSyncPluginResource *resource); OSYNC_EXPORT void osync_plugin_config_remove_resource(OSyncPluginConfig *pl ugin, OSyncPluginResource *resource);
OSYNC_EXPORT void osync_plugin_config_flush_resources(OSyncPluginConfig *pl ugin);
/* Connection */ /* Connection */
OSYNC_EXPORT OSyncPluginConnection *osync_plugin_config_get_connection(OSyn cPluginConfig *config); OSYNC_EXPORT OSyncPluginConnection *osync_plugin_config_get_connection(OSyn cPluginConfig *config);
OSYNC_EXPORT void osync_plugin_config_set_connection(OSyncPluginConfig *con fig, OSyncPluginConnection *connection); OSYNC_EXPORT void osync_plugin_config_set_connection(OSyncPluginConfig *con fig, OSyncPluginConnection *connection);
#endif /*_OPENSYNC_PLUGIN_CONFIG_H_*/ #endif /*_OPENSYNC_PLUGIN_CONFIG_H_*/
 End of changes. 3 change blocks. 
0 lines changed or deleted 16 lines changed or added


 opensync_plugin_connection.h   opensync_plugin_connection.h 
skipping to change at line 30 skipping to change at line 30
#ifndef _OPENSYNC_PLUGIN_CONNECTION_H_ #ifndef _OPENSYNC_PLUGIN_CONNECTION_H_
#define _OPENSYNC_PLUGIN_CONNECTION_H_ #define _OPENSYNC_PLUGIN_CONNECTION_H_
/*! @brief Gives information about the current connection type /*! @brief Gives information about the current connection type
* *
* @ingroup OSyncPluginConnectionAPI * @ingroup OSyncPluginConnectionAPI
**/ **/
typedef enum { typedef enum {
/** Unknown */ /** Unknown */
OSYNC_PLUGIN_CONNECTION_UNKNOWN = 0, OSYNC_PLUGIN_CONNECTION_UNKNOWN = 0,
/** Bluetooth */ /** Bluetooth */
OSYNC_PLUGIN_CONNECTION_BLUETOOTH, OSYNC_PLUGIN_CONNECTION_BLUETOOTH = (1 << 0),
/** USB */ /** USB */
OSYNC_PLUGIN_CONNECTION_USB, OSYNC_PLUGIN_CONNECTION_USB = (1 << 1),
/** Network */ /** Network */
OSYNC_PLUGIN_CONNECTION_NETWORK, OSYNC_PLUGIN_CONNECTION_NETWORK = (1 << 2),
/** Serial */ /** Serial */
OSYNC_PLUGIN_CONNECTION_SERIAL, OSYNC_PLUGIN_CONNECTION_SERIAL = (1 << 3),
/** IrDA */ /** IrDA */
OSYNC_PLUGIN_CONNECTION_IRDA OSYNC_PLUGIN_CONNECTION_IRDA = (1 << 4)
} OSyncPluginConnectionType; } OSyncPluginConnectionType;
OSYNC_EXPORT OSyncPluginConnection *osync_plugin_connection_new(OSyncPlugin typedef OSyncPluginConnectionType OSyncPluginConnectionSupportedFlag;
ConnectionType type, OSyncError **error); typedef unsigned int OSyncPluginConnectionSupportedFlags;
typedef enum {
/* Bluetooth */
OSYNC_PLUGIN_CONNECTION_BLUETOOTH_ADDRESS = (1 << 0),
OSYNC_PLUGIN_CONNECTION_BLUETOOTH_RFCOMM = (1 << 1),
OSYNC_PLUGIN_CONNECTION_BLUETOOTH_SDPUUID = (1 << 2),
/* USB */
OSYNC_PLUGIN_CONNECTION_USB_VENDORID = (1 << 3),
OSYNC_PLUGIN_CONNECTION_USB_PRODUCTID = (1 << 4),
OSYNC_PLUGIN_CONNECTION_USB_INTERFACE = (1 << 5),
/* Network */
OSYNC_PLUGIN_CONNECTION_NETWORK_ADDRESS = (1 << 6),
OSYNC_PLUGIN_CONNECTION_NETWORK_PORT = (1 << 7),
OSYNC_PLUGIN_CONNECTION_NETWORK_PROTOCOL = (1 << 8),
OSYNC_PLUGIN_CONNECTION_NETWORK_DNSSD = (1 << 9),
/* Serial */
OSYNC_PLUGIN_CONNECTION_SERIAL_SPEED = (1 << 10),
OSYNC_PLUGIN_CONNECTION_SERIAL_DEVICENODE = (1 << 11),
/* IrDA */
OSYNC_PLUGIN_CONNECTION_IRDA_SERVICE = (1 << 12)
} OSyncPluginConnectionOptionSupportedFlag;
typedef unsigned int OSyncPluginConnectionOptionSupportedFlags;
OSYNC_EXPORT OSyncPluginConnection *osync_plugin_connection_new(OSyncError
**error);
OSYNC_EXPORT void osync_plugin_connection_unref(OSyncPluginConnection *conn ection); OSYNC_EXPORT void osync_plugin_connection_unref(OSyncPluginConnection *conn ection);
OSYNC_EXPORT OSyncPluginConnection *osync_plugin_connection_ref(OSyncPlugin Connection *connection); OSYNC_EXPORT OSyncPluginConnection *osync_plugin_connection_ref(OSyncPlugin Connection *connection);
OSYNC_EXPORT OSyncPluginConnectionType osync_plugin_connection_get_type(OSy ncPluginConnection *connection); OSYNC_EXPORT OSyncPluginConnectionType osync_plugin_connection_get_type(OSy ncPluginConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_set_type(OSyncPluginConnection *c
onnection, OSyncPluginConnectionType type);
OSYNC_EXPORT osync_bool osync_plugin_connection_is_supported(OSyncPluginCon
nection *connection, OSyncPluginConnectionSupportedFlag flag);
OSYNC_EXPORT void osync_plugin_connection_set_supported(OSyncPluginConnecti
on *connection, OSyncPluginConnectionSupportedFlags flags);
OSYNC_EXPORT osync_bool osync_plugin_connection_option_is_supported(OSyncPl
uginConnection *connection, OSyncPluginConnectionOptionSupportedFlag flag);
OSYNC_EXPORT void osync_plugin_connection_option_set_supported(OSyncPluginC
onnection *connection, OSyncPluginConnectionOptionSupportedFlags flags);
/* Bluetooth */ /* Bluetooth */
OSYNC_EXPORT const char *osync_plugin_connection_bt_get_addr(OSyncPluginCon nection *connection); OSYNC_EXPORT const char *osync_plugin_connection_bt_get_addr(OSyncPluginCon nection *connection);
OSYNC_EXPORT void osync_plugin_connection_bt_set_addr(OSyncPluginConnection *connection, const char *address); OSYNC_EXPORT void osync_plugin_connection_bt_set_addr(OSyncPluginConnection *connection, const char *address);
OSYNC_EXPORT unsigned int osync_plugin_connection_bt_get_channel(OSyncPlugi nConnection *connection); OSYNC_EXPORT unsigned int osync_plugin_connection_bt_get_channel(OSyncPlugi nConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_bt_set_channel(OSyncPluginConnect ion *connection, unsigned int channel); OSYNC_EXPORT void osync_plugin_connection_bt_set_channel(OSyncPluginConnect ion *connection, unsigned int channel);
OSYNC_EXPORT const char *osync_plugin_connection_bt_get_sdpuuid(OSyncPlugin Connection *connection); OSYNC_EXPORT const char *osync_plugin_connection_bt_get_sdpuuid(OSyncPlugin Connection *connection);
OSYNC_EXPORT void osync_plugin_connection_bt_set_sdpuuid(OSyncPluginConnect ion *connection, const char *sdpuuid); OSYNC_EXPORT void osync_plugin_connection_bt_set_sdpuuid(OSyncPluginConnect ion *connection, const char *sdpuuid);
/* USB */ /* USB */
OSYNC_EXPORT unsigned int osync_plugin_connection_usb_get_vendorid(OSyncPlu OSYNC_EXPORT const char *osync_plugin_connection_usb_get_vendorid(OSyncPlug
ginConnection *connection); inConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_usb_set_vendorid(OSyncPluginConne OSYNC_EXPORT void osync_plugin_connection_usb_set_vendorid(OSyncPluginConne
ction *connection, unsigned int vendorid); ction *connection, const char *vendorid);
OSYNC_EXPORT unsigned int osync_plugin_connection_usb_get_productid(OSyncPl OSYNC_EXPORT const char *osync_plugin_connection_usb_get_productid(OSyncPlu
uginConnection *connection); ginConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_usb_set_productid(OSyncPluginConn OSYNC_EXPORT void osync_plugin_connection_usb_set_productid(OSyncPluginConn
ection *connection, unsigned int productid); ection *connection, const char *productid);
OSYNC_EXPORT unsigned int osync_plugin_connection_usb_get_interface(OSyncPl uginConnection *connection); OSYNC_EXPORT unsigned int osync_plugin_connection_usb_get_interface(OSyncPl uginConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_usb_set_interface(OSyncPluginConn ection *connection, unsigned int interface); OSYNC_EXPORT void osync_plugin_connection_usb_set_interface(OSyncPluginConn ection *connection, unsigned int interface);
/* Network */ /* Network */
OSYNC_EXPORT const char *osync_plugin_connection_net_get_address(OSyncPlugi nConnection *connection); OSYNC_EXPORT const char *osync_plugin_connection_net_get_address(OSyncPlugi nConnection *connection);
OSYNC_EXPORT void osync_plugin_connection_net_set_address(OSyncPluginConnec tion *connection, const char *address); OSYNC_EXPORT void osync_plugin_connection_net_set_address(OSyncPluginConnec tion *connection, const char *address);
OSYNC_EXPORT unsigned int osync_plugin_connection_net_get_port(OSyncPluginC onnection *connection); OSYNC_EXPORT unsigned int osync_plugin_connection_net_get_port(OSyncPluginC onnection *connection);
OSYNC_EXPORT void osync_plugin_connection_net_set_port(OSyncPluginConnectio n *connection, unsigned int port); OSYNC_EXPORT void osync_plugin_connection_net_set_port(OSyncPluginConnectio n *connection, unsigned int port);
 End of changes. 10 change blocks. 
16 lines changed or deleted 54 lines changed or added


 opensync_plugin_localization.h   opensync_plugin_localization.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_PLUGIN_LOCALIZATION_H_ #ifndef _OPENSYNC_PLUGIN_LOCALIZATION_H_
#define _OPENSYNC_PLUGIN_LOCALIZATION_H_ #define _OPENSYNC_PLUGIN_LOCALIZATION_H_
typedef enum {
OSYNC_PLUGIN_LOCALIZATION_ENCODING = (1 << 0),
OSYNC_PLUGIN_LOCALIZATION_TIMEZONE = (1 << 1),
OSYNC_PLUGIN_LOCALIZATION_LANGUAGE = (1 << 2),
} OSyncPluginLocalizationOptionSupportedFlag;
typedef unsigned int OSyncPluginLocalizationOptionSupportedFlags;
OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_localization_new(OSyncEr ror **error); OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_localization_new(OSyncEr ror **error);
OSYNC_EXPORT void osync_plugin_localization_unref(OSyncPluginLocalization * local); OSYNC_EXPORT void osync_plugin_localization_unref(OSyncPluginLocalization * local);
OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_localization_ref(OSyncPl uginLocalization *local); OSYNC_EXPORT OSyncPluginLocalization *osync_plugin_localization_ref(OSyncPl uginLocalization *local);
OSYNC_EXPORT osync_bool osync_plugin_localization_option_is_supported(OSync
PluginLocalization *local, OSyncPluginLocalizationOptionSupportedFlag flag)
;
OSYNC_EXPORT void osync_plugin_localization_option_set_supported(OSyncPlugi
nLocalization *local, OSyncPluginLocalizationOptionSupportedFlags flags);
OSYNC_EXPORT const char *osync_plugin_localization_get_encoding(OSyncPlugin Localization *local); OSYNC_EXPORT const char *osync_plugin_localization_get_encoding(OSyncPlugin Localization *local);
OSYNC_EXPORT void osync_plugin_localization_set_encoding(OSyncPluginLocaliz ation *local, const char *encoding); OSYNC_EXPORT void osync_plugin_localization_set_encoding(OSyncPluginLocaliz ation *local, const char *encoding);
OSYNC_EXPORT const char *osync_plugin_localization_get_timezone(OSyncPlugin Localization *local); OSYNC_EXPORT const char *osync_plugin_localization_get_timezone(OSyncPlugin Localization *local);
OSYNC_EXPORT void osync_plugin_localization_set_timezone(OSyncPluginLocaliz ation *local, const char *timezone); OSYNC_EXPORT void osync_plugin_localization_set_timezone(OSyncPluginLocaliz ation *local, const char *timezone);
OSYNC_EXPORT const char *osync_plugin_localization_get_language(OSyncPlugin Localization *local); OSYNC_EXPORT const char *osync_plugin_localization_get_language(OSyncPlugin Localization *local);
OSYNC_EXPORT void osync_plugin_localization_set_language(OSyncPluginLocaliz ation *local, const char *language); OSYNC_EXPORT void osync_plugin_localization_set_language(OSyncPluginLocaliz ation *local, const char *language);
#endif /*_OPENSYNC_PLUGIN_LOCALIZATION_H_*/ #endif /*_OPENSYNC_PLUGIN_LOCALIZATION_H_*/
 End of changes. 2 change blocks. 
0 lines changed or deleted 14 lines changed or added


 opensync_plugin_resource.h   opensync_plugin_resource.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
*/ */
#ifndef _OPENSYNC_PLUGIN_RESOURCE_H_ #ifndef _OPENSYNC_PLUGIN_RESOURCE_H_
#define _OPENSYNC_PLUGIN_RESOURCE_H_ #define _OPENSYNC_PLUGIN_RESOURCE_H_
typedef enum {
OSYNC_PLUGIN_RESOURCE_NAME = (1 << 0),
OSYNC_PLUGIN_RESOURCE_PATH = (1 << 1),
OSYNC_PLUGIN_RESOURCE_URL = (1 << 2),
} OSyncPluginResourceOptionSupportedFlag;
typedef unsigned int OSyncPluginResourceOptionSupportedFlags;
OSYNC_EXPORT OSyncPluginResource *osync_plugin_resource_new(OSyncError **er ror); OSYNC_EXPORT OSyncPluginResource *osync_plugin_resource_new(OSyncError **er ror);
OSYNC_EXPORT void osync_plugin_resource_unref(OSyncPluginResource *resource ); OSYNC_EXPORT void osync_plugin_resource_unref(OSyncPluginResource *resource );
OSYNC_EXPORT OSyncPluginResource *osync_plugin_resource_ref(OSyncPluginReso urce *resource); OSYNC_EXPORT OSyncPluginResource *osync_plugin_resource_ref(OSyncPluginReso urce *resource);
OSYNC_EXPORT osync_bool osync_plugin_resource_option_is_supported(OSyncPlug
inResource *resource, OSyncPluginResourceOptionSupportedFlag flag);
OSYNC_EXPORT void osync_plugin_resource_option_set_supported(OSyncPluginRes
ource *resource, OSyncPluginResourceOptionSupportedFlags flags);
OSYNC_EXPORT osync_bool osync_plugin_resource_is_enabled(OSyncPluginResourc e *resource); OSYNC_EXPORT osync_bool osync_plugin_resource_is_enabled(OSyncPluginResourc e *resource);
OSYNC_EXPORT void osync_plugin_resource_enable(OSyncPluginResource *resourc e, osync_bool enable); OSYNC_EXPORT void osync_plugin_resource_enable(OSyncPluginResource *resourc e, osync_bool enable);
OSYNC_EXPORT const char *osync_plugin_resource_get_name(OSyncPluginResource *resource); OSYNC_EXPORT const char *osync_plugin_resource_get_name(OSyncPluginResource *resource);
OSYNC_EXPORT void osync_plugin_resource_set_name(OSyncPluginResource *resou rce, const char *name); OSYNC_EXPORT void osync_plugin_resource_set_name(OSyncPluginResource *resou rce, const char *name);
OSYNC_EXPORT const char *osync_plugin_resource_get_mime(OSyncPluginResource *resource); OSYNC_EXPORT const char *osync_plugin_resource_get_mime(OSyncPluginResource *resource);
OSYNC_EXPORT void osync_plugin_resource_set_mime(OSyncPluginResource *resou rce, const char *mime); OSYNC_EXPORT void osync_plugin_resource_set_mime(OSyncPluginResource *resou rce, const char *mime);
/* /*
OSYNC_EXPORT OSyncObjFormat *osync_plugin_resource_get_objformat(OSyncPlugi nResource *resource); OSYNC_EXPORT OSyncObjFormat *osync_plugin_resource_get_objformat(OSyncPlugi nResource *resource);
OSYNC_EXPORT void osync_plugin_resource_set_objformat(OSyncPluginResource * resource, OSyncObjFormat *objformat); OSYNC_EXPORT void osync_plugin_resource_set_objformat(OSyncPluginResource * resource, OSyncObjFormat *objformat);
*/ */
OSYNC_EXPORT const char *osync_plugin_resource_get_preferred_format(OSyncPl
uginResource *resource);
OSYNC_EXPORT void osync_plugin_resource_set_preferred_format(OSyncPluginRes
ource *resource, const char *preferred_format);
OSYNC_EXPORT OSyncList *osync_plugin_resource_get_objformat_sinks(OSyncPlug inResource *resource); OSYNC_EXPORT OSyncList *osync_plugin_resource_get_objformat_sinks(OSyncPlug inResource *resource);
OSYNC_EXPORT void osync_plugin_resource_add_objformat_sink(OSyncPluginResou rce *resource, OSyncObjFormatSink *formatsink); OSYNC_EXPORT void osync_plugin_resource_add_objformat_sink(OSyncPluginResou rce *resource, OSyncObjFormatSink *formatsink);
OSYNC_EXPORT void osync_plugin_resource_remove_objformat_sink(OSyncPluginRe source *resource, OSyncObjFormatSink *formatsink); OSYNC_EXPORT void osync_plugin_resource_remove_objformat_sink(OSyncPluginRe source *resource, OSyncObjFormatSink *formatsink);
OSYNC_EXPORT const char *osync_plugin_resource_get_objtype(OSyncPluginResou rce *resource); OSYNC_EXPORT const char *osync_plugin_resource_get_objtype(OSyncPluginResou rce *resource);
OSYNC_EXPORT void osync_plugin_resource_set_objtype(OSyncPluginResource *re source, const char *objtype); OSYNC_EXPORT void osync_plugin_resource_set_objtype(OSyncPluginResource *re source, const char *objtype);
OSYNC_EXPORT const char *osync_plugin_resource_get_path(OSyncPluginResource *resource); OSYNC_EXPORT const char *osync_plugin_resource_get_path(OSyncPluginResource *resource);
OSYNC_EXPORT void osync_plugin_resource_set_path(OSyncPluginResource *resou rce, const char *path); OSYNC_EXPORT void osync_plugin_resource_set_path(OSyncPluginResource *resou rce, const char *path);
 End of changes. 3 change blocks. 
0 lines changed or deleted 17 lines changed or added


 opensync_serializer.h   opensync_serializer.h 
skipping to change at line 42 skipping to change at line 42
OSYNC_EXPORT osync_bool osync_marshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink *sink, OSyncError **error); OSYNC_EXPORT osync_bool osync_marshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink *sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_objformat_sink(OSyncMessage *messag e, OSyncObjFormatSink **sink, OSyncError **error); OSYNC_EXPORT osync_bool osync_demarshal_objformat_sink(OSyncMessage *messag e, OSyncObjFormatSink **sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_marshal_objtype_sink(OSyncMessage *message, O SyncObjTypeSink *sink, OSyncError **error); OSYNC_EXPORT osync_bool osync_marshal_objtype_sink(OSyncMessage *message, O SyncObjTypeSink *sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink **sink, OSyncError **error); OSYNC_EXPORT osync_bool osync_demarshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink **sink, OSyncError **error);
OSYNC_EXPORT osync_bool osync_marshal_pluginconfig(OSyncMessage *message, O SyncPluginConfig *config, OSyncError **error); OSYNC_EXPORT osync_bool osync_marshal_pluginconfig(OSyncMessage *message, O SyncPluginConfig *config, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_pluginconfig(OSyncMessage *message, OSyncPluginConfig **config, OSyncError **error); OSYNC_EXPORT osync_bool osync_demarshal_pluginconfig(OSyncMessage *message, OSyncPluginConfig **config, OSyncError **error);
OSYNC_EXPORT osync_bool osync_marshal_pluginresource(OSyncMessage *message,
OSyncPluginResource *res, OSyncError **error);
OSYNC_EXPORT osync_bool osync_demarshal_pluginresource(OSyncMessage *messag
e, OSyncPluginResource **res, OSyncError **error);
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 opensync_sink.h   opensync_sink.h 
skipping to change at line 54 skipping to change at line 54
} OSyncObjTypeSinkFunctions; } OSyncObjTypeSinkFunctions;
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_main_sink_new(OSyncError **err or); OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_main_sink_new(OSyncError **err or);
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_new(const char *objtype, OSyncError **error); OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_new(const char *objtype, OSyncError **error);
OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_ref(OSyncObjTypeSink *sin k); OSYNC_EXPORT OSyncObjTypeSink *osync_objtype_sink_ref(OSyncObjTypeSink *sin k);
OSYNC_EXPORT void osync_objtype_sink_unref(OSyncObjTypeSink *sink); OSYNC_EXPORT void osync_objtype_sink_unref(OSyncObjTypeSink *sink);
OSYNC_EXPORT const char *osync_objtype_sink_get_name(OSyncObjTypeSink *sink ); OSYNC_EXPORT const char *osync_objtype_sink_get_name(OSyncObjTypeSink *sink );
OSYNC_EXPORT void osync_objtype_sink_set_name(OSyncObjTypeSink *sink, const char *name); OSYNC_EXPORT void osync_objtype_sink_set_name(OSyncObjTypeSink *sink, const char *name);
OSYNC_EXPORT const char *osync_objtype_sink_get_preferred_format(OSyncObjTy
peSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_preferred_format(OSyncObjTypeSink
*sink, const char *preferred_format);
OSYNC_EXPORT unsigned int osync_objtype_sink_num_objformat_sinks(OSyncObjTy peSink *sink); OSYNC_EXPORT unsigned int osync_objtype_sink_num_objformat_sinks(OSyncObjTy peSink *sink);
OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_nth_objformat_sink(OSyn cObjTypeSink *sink, unsigned int nth); OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_nth_objformat_sink(OSyn cObjTypeSink *sink, unsigned int nth);
OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_find_objformat_sink(OSy ncObjTypeSink *sink, OSyncObjFormat *objformat); OSYNC_EXPORT OSyncObjFormatSink *osync_objtype_sink_find_objformat_sink(OSy ncObjTypeSink *sink, OSyncObjFormat *objformat);
OSYNC_EXPORT OSyncList *osync_objtype_sink_get_objformat_sinks(OSyncObjType Sink *sink); OSYNC_EXPORT OSyncList *osync_objtype_sink_get_objformat_sinks(OSyncObjType Sink *sink);
OSYNC_EXPORT void osync_objtype_sink_add_objformat_sink(OSyncObjTypeSink *s ink, OSyncObjFormatSink *objformatsink); OSYNC_EXPORT void osync_objtype_sink_add_objformat_sink(OSyncObjTypeSink *s ink, OSyncObjFormatSink *objformatsink);
OSYNC_EXPORT void osync_objtype_sink_remove_objformat_sink(OSyncObjTypeSink *sink, OSyncObjFormatSink *objformatsink); OSYNC_EXPORT void osync_objtype_sink_remove_objformat_sink(OSyncObjTypeSink *sink, OSyncObjFormatSink *objformatsink);
OSYNC_EXPORT void osync_objtype_sink_set_functions(OSyncObjTypeSink *sink, OSyncObjTypeSinkFunctions functions, void *userdata); OSYNC_EXPORT void osync_objtype_sink_set_functions(OSyncObjTypeSink *sink, OSyncObjTypeSinkFunctions functions, void *userdata);
OSYNC_EXPORT void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink); OSYNC_EXPORT void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink);
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 opensync_xmlformat.h   opensync_xmlformat.h 
skipping to change at line 54 skipping to change at line 54
OSYNC_EXPORT const char *osync_xmlformat_root_name(OSyncXMLFormat *xmlforma t); OSYNC_EXPORT const char *osync_xmlformat_root_name(OSyncXMLFormat *xmlforma t);
OSYNC_EXPORT const char *osync_xmlformat_get_objtype(OSyncXMLFormat *xmlfor mat); OSYNC_EXPORT const char *osync_xmlformat_get_objtype(OSyncXMLFormat *xmlfor mat);
OSYNC_EXPORT OSyncXMLField *osync_xmlformat_get_first_field(OSyncXMLFormat *xmlformat); OSYNC_EXPORT OSyncXMLField *osync_xmlformat_get_first_field(OSyncXMLFormat *xmlformat);
OSYNC_EXPORT OSyncXMLFieldList *osync_xmlformat_search_field(OSyncXMLFormat *xmlformat, const char *name, OSyncError **error, ...); OSYNC_EXPORT OSyncXMLFieldList *osync_xmlformat_search_field(OSyncXMLFormat *xmlformat, const char *name, OSyncError **error, ...);
OSYNC_EXPORT osync_bool osync_xmlformat_assemble(OSyncXMLFormat *xmlformat, char **buffer, unsigned int *size); OSYNC_EXPORT osync_bool osync_xmlformat_assemble(OSyncXMLFormat *xmlformat, char **buffer, unsigned int *size);
OSYNC_EXPORT osync_bool osync_xmlformat_validate(OSyncXMLFormat *xmlformat, OSyncError **error); OSYNC_EXPORT osync_bool osync_xmlformat_validate(OSyncXMLFormat *xmlformat, OSyncError **error);
OSYNC_EXPORT void osync_xmlformat_sort(OSyncXMLFormat *xmlformat); OSYNC_EXPORT void osync_xmlformat_sort(OSyncXMLFormat *xmlformat);
OSYNC_EXPORT osync_bool osync_xmlformat_is_sorted(OSyncXMLFormat *xmlformat );
OSYNC_EXPORT OSyncConvCmpResult osync_xmlformat_compare(OSyncXMLFormat *xml format1, OSyncXMLFormat *xmlformat2, OSyncXMLPoints points[], int basic_poi nts, int treshold); OSYNC_EXPORT OSyncConvCmpResult osync_xmlformat_compare(OSyncXMLFormat *xml format1, OSyncXMLFormat *xmlformat2, OSyncXMLPoints points[], int basic_poi nts, int treshold);
OSYNC_EXPORT osync_bool osync_xmlformat_copy(OSyncXMLFormat *source, OSyncX MLFormat **destination, OSyncError **error);
OSYNC_EXPORT unsigned int osync_xmlformat_size(); OSYNC_EXPORT unsigned int osync_xmlformat_size();
#endif /*OPENSYNC_XMLFORMAT_H_*/ #endif /*OPENSYNC_XMLFORMAT_H_*/
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/