From: <svn...@op...> - 2009-06-17 10:24:03
|
Author: bricks Date: Wed Jun 17 12:23:57 2009 New Revision: 5672 URL: http://www.opensync.org/changeset/5672 Log: Added an OSyncError parameter for osync_format_env_register_converter format plugin related changes refs #1087 Modified: format-plugins/tomboy-note/src/tomboy_note.c format-plugins/vformat/src/vcard.c format-plugins/vformat/src/vevent.c format-plugins/vformat/src/vformat-xmlformat.c format-plugins/vformat/src/vjournal.c format-plugins/vformat/src/vnote.c format-plugins/vformat/src/vtodo.c format-plugins/xmlformat/trunk/src/xmlformat-doc.c Modified: format-plugins/tomboy-note/src/tomboy_note.c ============================================================================== --- format-plugins/tomboy-note/src/tomboy_note.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/tomboy-note/src/tomboy_note.c Wed Jun 17 12:23:57 2009 (r5672) @@ -626,7 +626,7 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, tomboynote, detect_tomboynote, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); OSyncObjFormat *xmlformat = osync_format_env_find_objformat(env, "xmlformat-note"); @@ -640,7 +640,7 @@ osync_error_unref(error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, tomboynote, xmlformat, conv_tomboynote_to_xmlformat, error); @@ -649,7 +649,7 @@ osync_error_unref(error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/vformat/src/vcard.c ============================================================================== --- format-plugins/vformat/src/vcard.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vcard.c Wed Jun 17 12:23:57 2009 (r5672) @@ -138,13 +138,13 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, vcard21, detect_plain_as_vcard21, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); conv = osync_converter_new_detector(plain, vcard30, detect_plain_as_vcard30, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/vformat/src/vevent.c ============================================================================== --- format-plugins/vformat/src/vevent.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vevent.c Wed Jun 17 12:23:57 2009 (r5672) @@ -143,13 +143,13 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, vevent10, detect_plain_as_vevent10, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); conv = osync_converter_new_detector(plain, vevent20, detect_plain_as_vevent20, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/vformat/src/vformat-xmlformat.c ============================================================================== --- format-plugins/vformat/src/vformat-xmlformat.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vformat-xmlformat.c Wed Jun 17 12:23:57 2009 (r5672) @@ -62,7 +62,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vevent10, xmlformat, conv_vevent10_to_xmlformat, &error); @@ -71,7 +71,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, xmlformat, vevent20, conv_xmlformat_to_vevent20, &error); @@ -80,7 +80,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vevent20, xmlformat, conv_vevent20_to_xmlformat, &error); @@ -89,7 +89,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); //todo stuff @@ -103,7 +103,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vtodo20, xmlformat, conv_vtodo20_to_xmlformat, &error); @@ -112,7 +112,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, xmlformat, vtodo10, conv_xmlformat_to_vtodo10, &error); @@ -121,7 +121,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vtodo10, xmlformat, conv_vtodo10_to_xmlformat, &error); @@ -130,7 +130,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); @@ -173,7 +173,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vcard21, xmlformat, conv_vcard_to_xmlformat, &error); @@ -182,7 +182,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); @@ -192,7 +192,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vcard30, xmlformat, conv_vcard_to_xmlformat, &error); @@ -201,7 +201,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); return TRUE; @@ -243,7 +243,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vnote, xmlformat, conv_vnote_to_xmlformat, &error); @@ -252,7 +252,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, xmlformat, vjournal, conv_xmlformat_to_vjournal, &error); @@ -261,7 +261,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, vjournal, xmlformat, conv_vjournal_to_xmlformat, &error); @@ -270,7 +270,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); Modified: format-plugins/vformat/src/vjournal.c ============================================================================== --- format-plugins/vformat/src/vjournal.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vjournal.c Wed Jun 17 12:23:57 2009 (r5672) @@ -91,7 +91,7 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, vjournal, detect_plain_as_vjournal, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/vformat/src/vnote.c ============================================================================== --- format-plugins/vformat/src/vnote.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vnote.c Wed Jun 17 12:23:57 2009 (r5672) @@ -90,7 +90,7 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, vnote, detect_plain_as_vnote, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/vformat/src/vtodo.c ============================================================================== --- format-plugins/vformat/src/vtodo.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/vformat/src/vtodo.c Wed Jun 17 12:23:57 2009 (r5672) @@ -118,13 +118,13 @@ OSyncFormatConverter *conv = osync_converter_new_detector(plain, vtodo10, detect_plain_as_vtodo10, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); conv = osync_converter_new_detector(plain, vtodo20, detect_plain_as_vtodo20, error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, error); osync_converter_unref(conv); return TRUE; Modified: format-plugins/xmlformat/trunk/src/xmlformat-doc.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat-doc.c Wed Jun 17 12:23:24 2009 (r5671) +++ format-plugins/xmlformat/trunk/src/xmlformat-doc.c Wed Jun 17 12:23:57 2009 (r5672) @@ -155,7 +155,7 @@ conv = osync_converter_new_detector(plain, fromformat, detect_func, &error); if (!conv) return FALSE; - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); } @@ -166,7 +166,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); conv = osync_converter_new(OSYNC_CONVERTER_CONV, toformat, fromformat, from_xml, &error); @@ -175,7 +175,7 @@ osync_error_unref(&error); return FALSE; } - osync_format_env_register_converter(env, conv); + osync_format_env_register_converter(env, conv, &error); osync_converter_unref(conv); return TRUE; |