From: <svn...@op...> - 2010-08-13 23:00:29
|
Author: cdfrey Date: Sat Aug 14 01:00:21 2010 New Revision: 6084 URL: http://www.opensync.org/changeset/6084 Log: Remove "xslt" directory config and use new osync_plugin_get_default_configdir() Modified: plugins/google-calendar/src/gcalendar.c plugins/google-calendar/src/google-data Modified: plugins/google-calendar/src/gcalendar.c ============================================================================== --- plugins/google-calendar/src/gcalendar.c Sat Aug 14 01:00:14 2010 (r6083) +++ plugins/google-calendar/src/gcalendar.c Sat Aug 14 01:00:21 2010 (r6084) @@ -796,7 +796,6 @@ OSyncPluginConfig *config; OSyncList *resources; OSyncList *r; - const char *xslt_config; plgdata = osync_try_malloc0(sizeof(struct gc_plgdata), error); config = osync_plugin_info_get_config(info); @@ -806,13 +805,7 @@ goto error_freeplg; } - xslt_config = osync_plugin_config_get_advancedoption_value_by_name(config, "xslt"); - if( !xslt_config ) { - osync_trace(TRACE_INTERNAL, "Cannot locate xslt config!\n"); - goto error_freeplg; - } - - plgdata->xslt_path = strdup(xslt_config); + plgdata->xslt_path = strdup(osync_plugin_get_default_configdir()); if( !plgdata->xslt_path ) goto error_freeplg; Modified: plugins/google-calendar/src/google-data ============================================================================== --- plugins/google-calendar/src/google-data Sat Aug 14 01:00:14 2010 (r6083) +++ plugins/google-calendar/src/google-data Sat Aug 14 01:00:21 2010 (r6084) @@ -2,14 +2,6 @@ <config version="1.0"> <AdvancedOptions> <AdvancedOption> - <!-- Location of XSLT files used to make conversion --> - <DisplayName>Path to XSLT files</DisplayName> - <Name>xslt</Name> - <Type>string</Type> - <Value>/usr/local/share/libopensync1/defaults</Value> - </AdvancedOption> - - <AdvancedOption> <!-- to be implemented in libgcal: use other calendar than default --> <DisplayName>Calendar title</DisplayName> <Name>title</Name> |