Menu
▾
▴
opensync-commits — Mailing list that will receive the commit information
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(56) |
Apr
(109) |
May
(15) |
Jun
(3) |
Jul
(37) |
Aug
(96) |
Sep
(40) |
Oct
(4) |
Nov
(54) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(47) |
Feb
(30) |
Mar
(102) |
Apr
(120) |
May
(68) |
Jun
(54) |
Jul
(53) |
Aug
(122) |
Sep
(190) |
Oct
(71) |
Nov
(85) |
Dec
(108) |
| 2007 |
Jan
(72) |
Feb
(190) |
Mar
(53) |
Apr
(101) |
May
(145) |
Jun
(148) |
Jul
(167) |
Aug
(143) |
Sep
(23) |
Oct
(198) |
Nov
(223) |
Dec
(195) |
| 2008 |
Jan
(100) |
Feb
(129) |
Mar
(79) |
Apr
(77) |
May
(34) |
Jun
(95) |
Jul
(112) |
Aug
(160) |
Sep
(82) |
Oct
(124) |
Nov
(199) |
Dec
(355) |
| 2009 |
Jan
(436) |
Feb
(89) |
Mar
(298) |
Apr
(189) |
May
(33) |
Jun
(88) |
Jul
(105) |
Aug
(44) |
Sep
(181) |
Oct
(87) |
Nov
(75) |
Dec
(1) |
| 2010 |
Jan
(63) |
Feb
(21) |
Mar
(3) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(26) |
Aug
(37) |
Sep
(26) |
Oct
(15) |
Nov
(13) |
Dec
|
|
From: <svn...@op...> - 2009-05-28 14:48:16
|
Author: dgollub Date: Thu May 28 16:48:03 2009 New Revision: 5649 URL: http://www.opensync.org/changeset/5649 Log: Fix for mapping_engine_same_similar_conflict which was randomly failing. Sometimes I see the mapping_engine_same_similar_conflict test fail on my system. I tracked the issue down to the order in which the mock_sync plugin reports changes in mock_report_dir. If entryA is reported before entryB then the test passes. If entryB is reported first then the test fails. I have 2 patches. The first one modifies mock_sync to sort the changes by file name before reporting them. It also adds a test which takes advantage of that to reliably reproduce this issue. The second patch tries to address the root cause of the issue. I'm not completely familiar with the opensync internals so it may need some work. It works for me and doesn't break any of the other tests. Patch by marka fixes #1123 Modified: trunk/opensync/engine/opensync_obj_engine.c trunk/tests/CMakeLists.txt trunk/tests/engine-tests/check_mapping_engine.c trunk/tests/mock-plugin/mock_sync.c Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Thu May 28 16:19:03 2009 (r5648) +++ trunk/opensync/engine/opensync_obj_engine.c Thu May 28 16:48:03 2009 (r5649) @@ -208,47 +208,44 @@ osync_bool found_similar = FALSE; OSyncConvCmpResult result = OSYNC_CONV_DATA_MISMATCH; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, mapping_engines, change, sinkengine, mapping_engine); - - for (m = mapping_engines; m; m = m->next) { - *mapping_engine = m->data; - + + for (m=mapping_engines; m && (result != OSYNC_CONV_DATA_SAME); m=m->next) { + OSyncMappingEngine *tmp_mapping_engine = m->data; + /* Go through the already existing mapping entries. We only consider mappings * which dont have a entry on our side and where the data comparsion does not * return MISMATCH */ - for (e = (*mapping_engine)->entries; e; e = e->next) { + for (e = tmp_mapping_engine->entries; e; e = e->next) { OSyncMappingEntryEngine *entry_engine = e->data; OSyncChange *mapping_change = NULL; + OSyncConvCmpResult tmp_result; + /* if the mapping already has a entry on our side, its not worth looking */ - if (entry_engine->sink_engine == sinkengine) { - if (!found_similar) - *mapping_engine = NULL; + if (entry_engine->sink_engine == sinkengine) + continue; - break; - } - mapping_change = osync_entry_engine_get_change(entry_engine); if (!mapping_change) continue; - - result = osync_change_compare(mapping_change, change); - if (result == OSYNC_CONV_DATA_MISMATCH) { - if (!found_similar) - *mapping_engine = NULL; - } else if (result == OSYNC_CONV_DATA_SAME) { + + tmp_result = osync_change_compare(mapping_change, change); + if(tmp_result == OSYNC_CONV_DATA_SAME) { + /* SAME is the best we can get */ + result = OSYNC_CONV_DATA_SAME; + *mapping_engine = tmp_mapping_engine; break; - } else if (result == OSYNC_CONV_DATA_SIMILAR) { - found_similar = TRUE; + } else if((tmp_result == OSYNC_CONV_DATA_SIMILAR) && + (result == OSYNC_CONV_DATA_MISMATCH)) + { + /* SIMILAR is better than MISMATCH */ + result = OSYNC_CONV_DATA_SIMILAR; + *mapping_engine = tmp_mapping_engine; } } - - if (*mapping_engine) { - osync_trace(TRACE_EXIT, "%s: Found %p", __func__, *mapping_engine); - return result; - } } - - osync_trace(TRACE_EXIT, "%s: Mismatch", __func__); - return OSYNC_CONV_DATA_MISMATCH; + + osync_trace(TRACE_EXIT, "%s: %d, %p", __func__, (int)result, *mapping_engine); + return result; } osync_bool osync_obj_engine_map_changes(OSyncObjEngine *engine, OSyncError **error) Modified: trunk/tests/CMakeLists.txt ============================================================================== --- trunk/tests/CMakeLists.txt Thu May 28 16:19:03 2009 (r5648) +++ trunk/tests/CMakeLists.txt Thu May 28 16:48:03 2009 (r5649) @@ -269,6 +269,7 @@ BUILD_CHECK_TEST( mapping_engine engine-tests/check_mapping_engine.c ${TEST_TARGET_LIBRARIES} ) OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict) +OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict2) OSYNC_TESTCASE(mapping_engine mapping_engine_same_similar_conflict_multi) BUILD_CHECK_TEST( member group-tests/check_member.c ${TEST_TARGET_LIBRARIES} ) Modified: trunk/tests/engine-tests/check_mapping_engine.c ============================================================================== --- trunk/tests/engine-tests/check_mapping_engine.c Thu May 28 16:19:03 2009 (r5648) +++ trunk/tests/engine-tests/check_mapping_engine.c Thu May 28 16:48:03 2009 (r5649) @@ -96,6 +96,72 @@ } END_TEST + +/* This is similar to the previous test except the initial entries are laid + * out like: + * + * (Content) Entry A Entry B + * Member 1 xxx xxy + * Member 2: xxy + * + * This catches order-dependent issues in the mapping selection code. + */ +START_TEST (mapping_engine_same_similar_conflict2) +{ + char *testbed = setup_testbed("mapping_engine"); + char *formatdir = g_strdup_printf("%s/formats", testbed); + char *plugindir = g_strdup_printf("%s/plugins", testbed); + + + osync_testing_system_abort("cp entryA.txt entryB.txt data1/"); + osync_testing_system_abort("cp entryB.txt data2/"); + + g_setenv("MOCK_FORMAT_PATH_COMPARE_NO", "1", TRUE); + + + OSyncError *error = NULL; + OSyncGroup *group = osync_group_new(&error); + fail_unless(group != NULL, NULL); + fail_unless(error == NULL, NULL); + + osync_group_set_schemadir(group, testbed); + fail_unless(osync_group_load(group, "configs/group", &error), NULL); + fail_unless(error == NULL, NULL); + + OSyncEngine *engine = osync_engine_new(group, &error); + fail_unless(engine != NULL, NULL); + fail_unless(error == NULL, NULL); + osync_group_unref(group); + + + osync_engine_set_conflict_callback(engine, conflict_callback_fail, NULL); + + osync_engine_set_schemadir(engine, testbed); + osync_engine_set_plugindir(engine, plugindir); + osync_engine_set_formatdir(engine, formatdir); + + fail_unless(osync_engine_initialize(engine, &error), NULL); + fail_unless(error == NULL, NULL); + + fail_unless(osync_engine_synchronize_and_block(engine, &error), NULL); + fail_unless(error == NULL, NULL); + + fail_unless(osync_testing_diff("data1", "data2"), NULL); + + fail_unless(osync_engine_finalize(engine, &error), NULL); + fail_unless(error == NULL, NULL); + + osync_engine_unref(engine); + + + g_free(formatdir); + g_free(plugindir); + + destroy_testbed(testbed); +} +END_TEST + + /* Functional Test: Mapping with multiple SAME&SIMILAR entries and multiple * members * @@ -176,6 +242,7 @@ OSYNC_TESTCASE_START("mapping_engine") OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict) +OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict2) OSYNC_TESTCASE_ADD(mapping_engine_same_similar_conflict_multi) OSYNC_TESTCASE_END Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Thu May 28 16:19:03 2009 (r5648) +++ trunk/tests/mock-plugin/mock_sync.c Thu May 28 16:48:03 2009 (r5649) @@ -284,6 +284,7 @@ char *path = NULL; GDir *dir = NULL; OSyncError *error = NULL; + OSyncList *sorted_dir_list = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, directory, subdir, ctx, sink); @@ -297,14 +298,24 @@ dir = g_dir_open(path, 0, &gerror); osync_assert(dir); - while ((de = g_dir_read_name(dir))) { + while((de = g_dir_read_name(dir))) { + sorted_dir_list = osync_list_insert_sorted(sorted_dir_list, + g_strdup(de), (OSyncCompareFunc)g_strcmp0); + } + + g_dir_close(dir); + + while(sorted_dir_list) { + de = sorted_dir_list->data; char *filename = g_build_filename(path, de, NULL); char *relative_filename = NULL; if (!subdir) relative_filename = g_strdup(de); else relative_filename = g_build_filename(subdir, de, NULL); - + g_free(sorted_dir_list->data); + sorted_dir_list = osync_list_remove(sorted_dir_list, sorted_dir_list->data); + osync_trace(TRACE_INTERNAL, "path2 %s %s", filename, relative_filename); if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) { @@ -368,8 +379,6 @@ } - g_dir_close(dir); - g_free(path); osync_trace(TRACE_EXIT, "%s", __func__); } |
|
From: <svn...@op...> - 2009-05-28 14:19:07
|
Author: dgollub Date: Thu May 28 16:19:03 2009 New Revision: 5648 URL: http://www.opensync.org/changeset/5648 Log: OSyncMappingEngine & OSyncMappingEntryEngine's don't get freed When the engine is finalized, it doesn't look like the OSyncMappingEngines or OSyncMappingEntryEngines are getting freed. I checked by adding log messages to the *_unref() functions. It looks like that an OSyncMappingEngines holds a reference on each OSyncMappingEntryEngines and each OSyncMappingEntryEngines holds a reference on the OSyncMappingEngines. A nice circle. Original patch by marka Sligthly adapted (coding style: // to /* */) fixes #1122 Modified: trunk/opensync/engine/opensync_mapping_entry_engine.c Modified: trunk/opensync/engine/opensync_mapping_entry_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_entry_engine.c Thu May 28 16:06:41 2009 (r5647) +++ trunk/opensync/engine/opensync_mapping_entry_engine.c Thu May 28 16:19:03 2009 (r5648) @@ -57,7 +57,7 @@ engine->objengine = objengine; - engine->mapping_engine = osync_mapping_engine_ref(mapping_engine); + engine->mapping_engine = mapping_engine; /* No reference taken */ engine->entry = osync_mapping_entry_ref(entry); sink_engine->entries = osync_list_append(sink_engine->entries, engine); @@ -89,9 +89,6 @@ if (engine->change) osync_change_unref(engine->change); - if (engine->mapping_engine) - osync_mapping_engine_unref(engine->mapping_engine); - if (engine->entry) osync_mapping_entry_unref(engine->entry); |
|
From: <svn...@op...> - 2009-05-28 14:06:45
|
Author: dgollub Date: Thu May 28 16:06:41 2009 New Revision: 5647 URL: http://www.opensync.org/changeset/5647 Log: Fix failing engine_error_discover_error testcase. Original patch by marka Slightly adapted - added ticket referces and additional sanity check. fixes #1121 Modified: trunk/tests/engine-tests/check_engine_error.c Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Thu May 28 10:47:30 2009 (r5646) +++ trunk/tests/engine-tests/check_engine_error.c Thu May 28 16:06:41 2009 (r5647) @@ -2964,7 +2964,9 @@ osync_group_load(group, "configs/group", &error); fail_unless(error == NULL, NULL); - OSyncMember *member = osync_group_nth_member(group, 1); + /* _find_member not _nth_member - see #1121 */ + OSyncMember *member = osync_group_find_member(group, 1); + fail_unless(member != NULL, NULL); OSyncEngine *engine = osync_engine_new(group, &error); fail_unless(engine != NULL, NULL); |
|
From: <svn...@op...> - 2009-05-28 08:47:35
|
Author: bricks Date: Thu May 28 10:47:30 2009 New Revision: 5646 URL: http://www.opensync.org/changeset/5646 Log: Fix for memory leak in osync_mapping_engine_new thanks to marka #refs 1120 Modified: trunk/opensync/engine/opensync_mapping_engine.c Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Wed May 20 18:47:34 2009 (r5645) +++ trunk/opensync/engine/opensync_mapping_engine.c Thu May 28 10:47:30 2009 (r5646) @@ -75,7 +75,7 @@ osync_error_set(error, OSYNC_ERROR_GENERIC, "Inconsistency in Mapping Table " "for Object Type \"%s\" detected.", osync_obj_engine_get_objtype(engine->parent)); - goto error; + goto error_free_engine; } entry_engine = osync_entry_engine_new(mapping_entry, engine, sink_engine, parent, error); |
|
From: <svn...@op...> - 2009-05-20 16:47:49
|
Author: scriptor Date: Wed May 20 18:47:34 2009 New Revision: 5645 URL: http://www.opensync.org/changeset/5645 Log: Added a question to the troubleshooting section. Modified: plugins/ldap-sync/README.lyx Modified: plugins/ldap-sync/README.lyx ============================================================================== --- plugins/ldap-sync/README.lyx Thu May 14 21:38:58 2009 (r5644) +++ plugins/ldap-sync/README.lyx Wed May 20 18:47:34 2009 (r5645) @@ -7022,6 +7022,136 @@ p on a fedora system. \end_layout +\begin_layout Section +LDAP ERROR: "Cannot modify object class". + structural object class modification from 'inetOrgPerson' to 'evolutionPerson' + not allowed. +\end_layout + +\begin_layout Standard +What has happened? +\end_layout + +\begin_layout Standard +The database containes an entry for object type "contact", that has originally + been stored as LDAP object class "inetOrgPerson". + This very entry is now to be modified according to one of the peers, say + the file-sync plugin. + However, the LDAP plugin is currently configured to use the format "ldap-evolut +ionperson" for object type "contact". + So it tries to perform the modification by the peer with the "ldap-evolutionper +son" format in mind. +\end_layout + +\begin_layout Standard +Solution: +\end_layout + +\begin_layout Standard +Simply change the configuration of the LDAP plugin. + Change the format from "ldap-evolutionperson" to "ldap-inetorgperson": +\end_layout + +\begin_layout Standard +From: +\end_layout + +\begin_layout LyX-Code +(...) +\end_layout + +\begin_layout LyX-Code + <Resource> +\end_layout + +\begin_layout LyX-Code + <Enabled>1</Enabled> +\end_layout + +\begin_layout LyX-Code + <Formats> +\end_layout + +\begin_layout LyX-Code + <Format> +\end_layout + +\begin_layout LyX-Code + <Name>ldap-evolutionperson</Name> +\end_layout + +\begin_layout LyX-Code + </Format> +\end_layout + +\begin_layout LyX-Code + </Formats> +\end_layout + +\begin_layout LyX-Code + <ObjType>contact</ObjType> +\end_layout + +\begin_layout LyX-Code + </Resource> +\end_layout + +\begin_layout LyX-Code +(...) +\end_layout + +\begin_layout Standard +To: +\end_layout + +\begin_layout LyX-Code +(...) +\end_layout + +\begin_layout LyX-Code + <Resource> +\end_layout + +\begin_layout LyX-Code + <Enabled>1</Enabled> +\end_layout + +\begin_layout LyX-Code + <Formats> +\end_layout + +\begin_layout LyX-Code + <Format> +\end_layout + +\begin_layout LyX-Code + <Name>ldap-inetorgperson</Name> +\end_layout + +\begin_layout LyX-Code + </Format> +\end_layout + +\begin_layout LyX-Code + </Formats> +\end_layout + +\begin_layout LyX-Code + <ObjType>contact</ObjType> +\end_layout + +\begin_layout LyX-Code + </Resource> +\end_layout + +\begin_layout LyX-Code +(...) +\end_layout + +\begin_layout LyX-Code + +\end_layout + \begin_layout Part References \end_layout |
|
From: <svn...@op...> - 2009-05-14 19:39:14
|
Author: Graham Cobb Date: Thu May 14 21:38:58 2009 New Revision: 5644 URL: http://www.opensync.org/changeset/5644 Log: gpe-sync: Fix to hashtable changes Modified: plugins/gpe/ChangeLog plugins/gpe/src/contacts.c plugins/gpe/src/utils.c Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Thu May 14 21:25:40 2009 (r5643) +++ plugins/gpe/ChangeLog Thu May 14 21:38:58 2009 (r5644) @@ -1,5 +1,9 @@ 2009-05-14 Graham Cobb <g+...@co...> + * src/utils.c: Add hashtable assertions + + * src/contacts.c (gpe_contacts_setup): Fix hashtable changes: request hashtable, add assertions + * src/gpe_sync.h: Bug #1082: Hashtable changes: remove hashtable pointer from sink_environment Modified: plugins/gpe/src/contacts.c ============================================================================== --- plugins/gpe/src/contacts.c Thu May 14 21:25:40 2009 (r5643) +++ plugins/gpe/src/contacts.c Thu May 14 21:38:58 2009 (r5644) @@ -43,6 +43,8 @@ gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -127,6 +129,8 @@ gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -234,6 +238,9 @@ goto exit; // No contact sink configured. Not an error. } + /* Request a hashtable from the framework. */ + osync_objtype_sink_enable_hashtable(sinkenv->sink, TRUE); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_contacts_get_changes); osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_contacts_commit_change); osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); Modified: plugins/gpe/src/utils.c ============================================================================== --- plugins/gpe/src/utils.c Thu May 14 21:25:40 2009 (r5643) +++ plugins/gpe/src/utils.c Thu May 14 21:38:58 2009 (r5644) @@ -84,6 +84,8 @@ OSyncError *error = NULL; OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sinkenv->sink); + gpe_assert(hashtable); + OSyncData *data = osync_data_new(string, strlen(string)+1, sinkenv->objformat, &error); if (!data) { osync_context_report_osyncwarning(ctx, error); @@ -138,6 +140,8 @@ OSyncError *error = NULL; OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sinkenv->sink); + gpe_assert(hashtable); + //check for deleted entries ... via hashtable int i; OSyncList *u, *uids = osync_hashtable_get_deleted(hashtable); |
|
From: <svn...@op...> - 2009-05-14 19:25:52
|
Author: Graham Cobb Date: Thu May 14 21:25:40 2009 New Revision: 5643 URL: http://www.opensync.org/changeset/5643 Log: gpe-sync: Bug #1082 - hashtable changes Modified: plugins/gpe/ChangeLog plugins/gpe/src/calendar.c plugins/gpe/src/contacts.c plugins/gpe/src/gpe_sync.c plugins/gpe/src/gpe_sync.h plugins/gpe/src/todo.c plugins/gpe/src/utils.c Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/ChangeLog Thu May 14 21:25:40 2009 (r5643) @@ -1,5 +1,12 @@ 2009-05-14 Graham Cobb <g+...@co...> + * src/gpe_sync.h: Bug #1082: Hashtable changes: remove hashtable + pointer from sink_environment + + * src/gpe_sync.c (sync_done): Bug #1082: Hashtable changes: do not save anchors + + * src/utils.c, src/todo.c, src/calendar.c, src/contacts.c: Bug #1082: Hashtable changes + * src/calendar.c (gpe_calendar_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new osync_objtype_sink_set_*_func() calls Modified: plugins/gpe/src/calendar.c ============================================================================== --- plugins/gpe/src/calendar.c Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/calendar.c Thu May 14 21:25:40 2009 (r5643) @@ -31,6 +31,7 @@ { osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; @@ -42,6 +43,8 @@ gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -89,7 +92,7 @@ osync_change_set_uid (change, g_strdup (buf)); } osync_change_set_hash (change, modified); - osync_hashtable_update_change (sinkenv->hashtable, change); + osync_hashtable_update_change (hashtable, change); osync_context_report_success(ctx); } else { @@ -122,9 +125,12 @@ OSyncError *error = NULL; sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -133,7 +139,7 @@ if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); - if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { + if (!osync_hashtable_slowsync(hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); osync_context_report_osyncerror(ctx, error); return; @@ -228,14 +234,6 @@ gpe_assert(sinkenv == &env->calendar_sink); // Check sinkenv is being passed correctly - char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); - // Note: caller responsible for freeing hashtable on any error - sinkenv->hashtable = osync_hashtable_new(tablepath, "event", error); - g_free(tablepath); - if (!sinkenv->hashtable) goto error; - - if (!osync_hashtable_load(sinkenv->hashtable, error)) goto error; - // Find sink sinkenv->sink = osync_plugin_info_find_objtype(info, "event"); if (!sinkenv->sink) { @@ -243,6 +241,9 @@ goto exit; // No event sink configured. Not an error. } + /* Request a hashtable from the framework. */ + osync_objtype_sink_enable_hashtable(sinkenv->sink, TRUE); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_calendar_get_changes); osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_calendar_commit_change); osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); Modified: plugins/gpe/src/contacts.c ============================================================================== --- plugins/gpe/src/contacts.c Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/contacts.c Thu May 14 21:25:40 2009 (r5643) @@ -31,6 +31,7 @@ { osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; @@ -89,7 +90,7 @@ osync_change_set_uid (change, g_strdup (buf)); } osync_change_set_hash (change, modified); - osync_hashtable_update_change (sinkenv->hashtable, change); + osync_hashtable_update_change (hashtable, change); osync_context_report_success(ctx); } else { @@ -122,6 +123,7 @@ OSyncError *error = NULL; sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly @@ -133,7 +135,7 @@ if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); - if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { + if (!osync_hashtable_slowsync(hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); osync_context_report_osyncerror(ctx, error); return; @@ -224,14 +226,6 @@ osync_bool gpe_contacts_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); - - char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); - // Note: caller responsible for freeing hashtable on any error - sinkenv->hashtable = osync_hashtable_new(tablepath, "contact", error); - g_free(tablepath); - if (!sinkenv->hashtable) goto error; - - if (!osync_hashtable_load(sinkenv->hashtable, error)) goto error; // Find sink sinkenv->sink = osync_plugin_info_find_objtype(info, "contact"); Modified: plugins/gpe/src/gpe_sync.c ============================================================================== --- plugins/gpe/src/gpe_sync.c Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/gpe_sync.c Thu May 14 21:25:40 2009 (r5643) @@ -441,14 +441,6 @@ //If we use anchors we have to update it now. - // Save hashtables - if (!osync_hashtable_save(env->contact_sink.hashtable, &error)) - goto error; - if (!osync_hashtable_save(env->todo_sink.hashtable, &error)) - goto error; - if (!osync_hashtable_save(env->calendar_sink.hashtable, &error)) - goto error; - //Answer the call osync_context_report_success(ctx); osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__); @@ -463,8 +455,6 @@ static void free_sink(sink_environment *sinkenv) { sinkenv->sink = NULL; - if (sinkenv->hashtable) osync_hashtable_unref(sinkenv->hashtable); - sinkenv->hashtable = NULL; } Modified: plugins/gpe/src/gpe_sync.h ============================================================================== --- plugins/gpe/src/gpe_sync.h Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/gpe_sync.h Thu May 14 21:25:40 2009 (r5643) @@ -40,7 +40,6 @@ typedef struct sink_environment { OSyncObjTypeSink *sink; OSyncObjFormat *objformat; - OSyncHashTable *hashtable; struct gpe_environment *gpe_env; } sink_environment; Modified: plugins/gpe/src/todo.c ============================================================================== --- plugins/gpe/src/todo.c Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/todo.c Thu May 14 21:25:40 2009 (r5643) @@ -31,6 +31,7 @@ { osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; gchar *response = NULL; @@ -42,6 +43,8 @@ gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -89,7 +92,7 @@ osync_change_set_uid (change, g_strdup(buf)); } osync_change_set_hash (change, modified); - osync_hashtable_update_change (sinkenv->hashtable, change); + osync_hashtable_update_change (hashtable, change); osync_context_report_success(ctx); } else { @@ -123,9 +126,12 @@ OSyncError *error = NULL; sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + gpe_assert(hashtable); + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -134,7 +140,7 @@ if (slowsync) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); - if (!osync_hashtable_slowsync(sinkenv->hashtable, &error)) { + if (!osync_hashtable_slowsync(hashtable, &error)) { osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); osync_context_report_osyncerror(ctx, error); return; @@ -225,14 +231,6 @@ { osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); - char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); - // Note: caller responsible for freeing hashtable on any error - sinkenv->hashtable = osync_hashtable_new(tablepath, "todo", error); - g_free(tablepath); - if (!sinkenv->hashtable) goto error; - - if (!osync_hashtable_load(sinkenv->hashtable, error)) goto error; - // Find sink sinkenv->sink = osync_plugin_info_find_objtype(info, "todo"); if (!sinkenv->sink) { @@ -240,6 +238,9 @@ goto exit; // No todo sink configured. Not an error. } + /* Request a hashtable from the framework. */ + osync_objtype_sink_enable_hashtable(sinkenv->sink, TRUE); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_todo_get_changes); osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_todo_commit_change); osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); Modified: plugins/gpe/src/utils.c ============================================================================== --- plugins/gpe/src/utils.c Thu May 14 21:04:43 2009 (r5642) +++ plugins/gpe/src/utils.c Thu May 14 21:25:40 2009 (r5643) @@ -82,6 +82,7 @@ osync_trace(TRACE_SENSITIVE, "GPE-SYNC %s: reporting item type = %s, uid = %s, hash = %s, string = %s", __func__, type, uid, hash, string); OSyncError *error = NULL; + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sinkenv->sink); OSyncData *data = osync_data_new(string, strlen(string)+1, sinkenv->objformat, &error); if (!data) { @@ -109,9 +110,9 @@ osync_change_set_hash (change, hash); osync_change_set_data (change, data); - OSyncChangeType changetype = osync_hashtable_get_changetype(sinkenv->hashtable, change); + OSyncChangeType changetype = osync_hashtable_get_changetype(hashtable, change); osync_change_set_changetype(change, changetype); - osync_hashtable_update_change (sinkenv->hashtable, change); + osync_hashtable_update_change (hashtable, change); if (changetype != OSYNC_CHANGE_TYPE_UNMODIFIED) { osync_context_report_change (ctx, change); @@ -135,10 +136,11 @@ osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p)", __func__, sinkenv, ctx); OSyncError *error = NULL; + OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sinkenv->sink); //check for deleted entries ... via hashtable int i; - OSyncList *u, *uids = osync_hashtable_get_deleted(sinkenv->hashtable); + OSyncList *u, *uids = osync_hashtable_get_deleted(hashtable); for (u = uids; u; u = u->next) { OSyncChange *change = osync_change_new(&error); if (!change) { @@ -166,7 +168,7 @@ osync_context_report_change(ctx, change); - osync_hashtable_update_change(sinkenv->hashtable, change); + osync_hashtable_update_change(hashtable, change); osync_change_unref(change); } @@ -174,3 +176,4 @@ osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__); } + |
|
From: <svn...@op...> - 2009-05-14 19:05:01
|
Author: Graham Cobb Date: Thu May 14 21:04:43 2009 New Revision: 5642 URL: http://www.opensync.org/changeset/5642 Log: gpe-sync: Bug 1086: Drop OSyncObjTypeSinkFunctions Modified: plugins/gpe/ChangeLog plugins/gpe/src/calendar.c plugins/gpe/src/contacts.c plugins/gpe/src/gpe_sync.c plugins/gpe/src/todo.c Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/ChangeLog Thu May 14 21:04:43 2009 (r5642) @@ -1,3 +1,28 @@ +2009-05-14 Graham Cobb <g+...@co...> + + * src/calendar.c (gpe_calendar_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/contacts.c (gpe_contacts_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/todo.c (gpe_todo_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/gpe_sync.c (initialize): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + +2009-02-25 Graham Cobb <g+...@co...> + + * src/todo.c (gpe_todo_commit_change): Add assert to check we have been passed the correct userdata + (gpe_todo_get_changes): Add assert to check we have been passed the correct userdata + + * src/contacts.c (gpe_contacts_commit_change): Add assert to check we have been passed the correct userdata + (gpe_contacts_get_changes): Add assert to check we have been passed the correct userdata + + * src/calendar.c (gpe_calendar_commit_change): Add assert to check we have been passed the correct userdata + (gpe_calendar_get_changes): Add assert to check we have been passed the correct userdata + 2009-02-08 Graham Cobb <g+...@co...> * gpe-sync-basic.xml: Create file Modified: plugins/gpe/src/calendar.c ============================================================================== --- plugins/gpe/src/calendar.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/calendar.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -121,6 +123,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -220,7 +224,9 @@ */ osync_bool gpe_calendar_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); + + gpe_assert(sinkenv == &env->calendar_sink); // Check sinkenv is being passed correctly char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -237,11 +243,9 @@ goto exit; // No event sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_calendar_get_changes; - functions.commit = gpe_calendar_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_calendar_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_calendar_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; Modified: plugins/gpe/src/contacts.c ============================================================================== --- plugins/gpe/src/contacts.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/contacts.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -121,6 +123,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -219,7 +223,7 @@ */ osync_bool gpe_contacts_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -236,11 +240,9 @@ goto exit; // No contact sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_contacts_get_changes; - functions.commit = gpe_contacts_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_contacts_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_contacts_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; Modified: plugins/gpe/src/gpe_sync.c ============================================================================== --- plugins/gpe/src/gpe_sync.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/gpe_sync.c Thu May 14 21:04:43 2009 (r5642) @@ -512,12 +512,10 @@ env->main_sink.sink = osync_objtype_main_sink_new(error); if (!env->main_sink.sink) goto error_free_env; - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.connect = gpe_connect; - functions.disconnect = gpe_disconnect; - functions.sync_done = sync_done; - osync_objtype_sink_set_functions(env->main_sink.sink, functions, &env->main_sink); + osync_objtype_sink_set_connect_func(env->main_sink.sink, gpe_connect); + osync_objtype_sink_set_disconnect_func(env->main_sink.sink, gpe_disconnect); + osync_objtype_sink_set_sync_done_func(env->main_sink.sink, sync_done); + osync_objtype_sink_set_userdata(env->main_sink.sink, &env->main_sink); osync_plugin_info_set_main_sink(info, env->main_sink.sink); env->main_sink.gpe_env = env; Modified: plugins/gpe/src/todo.c ============================================================================== --- plugins/gpe/src/todo.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/todo.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -122,6 +124,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -219,7 +223,7 @@ */ osync_bool gpe_todo_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -236,11 +240,9 @@ goto exit; // No todo sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_todo_get_changes; - functions.commit = gpe_todo_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_todo_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_todo_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; |
|
From: <svn...@op...> - 2009-05-12 13:09:04
|
Author: bellmich Date: Tue May 12 15:08:49 2009 New Revision: 1083 URL: http://libsyncml.opensync.org/changeset/1083 Log: If a slow-sync alert is initiated and the remote peer did not request it then the function must return false to trigger a status 508 (REFRESH_REQUIRED). If the requested alert type is not known then there is no need for a status and the function returns true. This can happen if the remote peer did not trigger the client via a SAN (e.g. OMA DS client over HTTP). Modified: trunk/libsyncml/data_sync_api/data_sync_client.c Modified: trunk/libsyncml/data_sync_api/data_sync_client.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_client.c Tue May 12 14:50:22 2009 (r1082) +++ trunk/libsyncml/data_sync_api/data_sync_client.c Tue May 12 15:08:49 2009 (r1083) @@ -241,10 +241,20 @@ smlDataSyncChangeCallback, datastore); } + /* If a slow-sync alert is initiated and the remote peer + * did not request it then the function must return false + * to trigger a status 508 (REFRESH_REQUIRED). + * If the requested alert type is not known then there + * is no need for a status and the function returns true. + * This can happen if the remote peer did not trigger + * the client via a SAN (e.g. OMA DS client over HTTP). + */ SmlBool ret = TRUE; if (alertType == SML_ALERT_SLOW_SYNC && - alertType != type) + alertType != type && + type != SML_ALERT_UNKNOWN) { ret = FALSE; + } smlTrace(TRACE_EXIT, "%s: %i", __func__, ret); return ret; |
|
From: <svn...@op...> - 2009-05-12 12:50:27
|
Author: bellmich Date: Tue May 12 14:50:22 2009 New Revision: 1082 URL: http://libsyncml.opensync.org/changeset/1082 Log: == should be = Modified: trunk/libsyncml/data_sync_api/data_sync_client.c Modified: trunk/libsyncml/data_sync_api/data_sync_client.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_client.c Tue May 5 14:11:08 2009 (r1081) +++ trunk/libsyncml/data_sync_api/data_sync_client.c Tue May 12 14:50:22 2009 (r1082) @@ -185,7 +185,7 @@ if (alertType == SML_ALERT_UNKNOWN) { smlTrace(TRACE_INTERNAL, "%s: no alert type => slow-sync", __func__); - alertType == SML_ALERT_SLOW_SYNC; + alertType = SML_ALERT_SLOW_SYNC; } if (alertType != SML_ALERT_SLOW_SYNC) { |
|
From: <svn...@op...> - 2009-05-11 17:45:09
|
Author: bellmich Date: Mon May 11 19:45:00 2009 New Revision: 215 URL: http://libwbxml.opensync.org/changeset/215 Log: The attgetopt.c dependency must be dynamically configured for both binaries. Modified: wbxml2/trunk/tools/CMakeLists.txt Modified: wbxml2/trunk/tools/CMakeLists.txt ============================================================================== --- wbxml2/trunk/tools/CMakeLists.txt Mon May 11 14:29:59 2009 (r214) +++ wbxml2/trunk/tools/CMakeLists.txt Mon May 11 19:45:00 2009 (r215) @@ -18,7 +18,7 @@ TARGET_LINK_LIBRARIES( wbxml2xml wbxml2 ) INSTALL( TARGETS wbxml2xml DESTINATION ${LIBWBXML_BIN_DIR} ) -ADD_EXECUTABLE( xml2wbxml xml2wbxml_tool.c attgetopt.c ) +ADD_EXECUTABLE( xml2wbxml xml2wbxml_tool.c ${ATTGETOPT} ) TARGET_LINK_LIBRARIES( xml2wbxml wbxml2 ) INSTALL( TARGETS xml2wbxml DESTINATION ${LIBWBXML_BIN_DIR} ) |
|
From: <svn...@op...> - 2009-05-11 12:30:02
|
Author: bellmich Date: Mon May 11 14:29:59 2009 New Revision: 214 URL: http://libwbxml.opensync.org/changeset/214 Log: added forgotten file of commit r213 Added: wbxml2/trunk/tools/config.h.cmake Added: wbxml2/trunk/tools/config.h.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxml2/trunk/tools/config.h.cmake Mon May 11 14:29:59 2009 (r214) @@ -0,0 +1,10 @@ +/* + * Copyright (C) 2008 Michael Bell <mic...@op...> + */ + +#ifndef WBXML_TOOLS_CONFIG_H +#define WBXML_TOOLS_CONFIG_H + +#cmakedefine FOUND_POSIX_GETOPT + +#endif /* WBXML_TOOLS_CONFIG_H */ |
|
From: <svn...@op...> - 2009-05-11 12:25:17
|
Author: bellmich Date: Mon May 11 14:25:14 2009 New Revision: 213 URL: http://libwbxml.opensync.org/changeset/213 Log: added getopt detection for ticket #34 Modified: wbxml2/trunk/CMakeLists.txt wbxml2/trunk/tools/CMakeLists.txt wbxml2/trunk/tools/getopt.h Modified: wbxml2/trunk/CMakeLists.txt ============================================================================== --- wbxml2/trunk/CMakeLists.txt Mon May 11 14:24:30 2009 (r212) +++ wbxml2/trunk/CMakeLists.txt Mon May 11 14:25:14 2009 (r213) @@ -84,6 +84,24 @@ INCLUDE( Testing ) ENDIF(CHECK_FOUND) +# look for getopt implementation in unistd.h + +INCLUDE(CheckFunctionExists) +INCLUDE(CheckIncludeFile) + +CHECK_INCLUDE_FILE( "unistd.h" LIBWBXML_TOOLS_UNISTD_H ) +IF( ${LIBWBXML_TOOLS_UNISTD_H} ) + SET( CMAKE_REQUIRED_INCLUDES ${LIBWBXML_TOOLS_UNISTD_H} ) + CHECK_FUNCTION_EXISTS( getopt LIBWBXML_POSIX_GETOPT ) +ELSE( ${LIBWBXML_TOOLS_UNISTD_H} ) + SET( LIBWBXML_POSIX_GETOPT OFF ) +ENDIF( ${LIBWBXML_TOOLS_UNISTD_H} ) +IF( LIBWBXML_POSIX_GETOPT ) + OPTION( FOUND_POSIX_GETOPT "POSIX getopt" ON ) +ELSE( LIBWBXML_POSIX_GETOPT ) + OPTION( FOUND_POSIX_GETOPT "POSIX getopt" OFF ) +ENDIF( LIBWBXML_POSIX_GETOPT ) + # look for the commands required for testing FIND_PROGRAM( PERL_PROGRAM "perl" ) @@ -179,6 +197,7 @@ INCLUDE( ShowStatus ) MESSAGE( STATUS "==================================================" ) SHOW_STATUS( WBXML_LIB_VERBOSE "verbose mode\t\t\t" ) +SHOW_STATUS( FOUND_POSIX_GETOPT "POSIX getopt\t\t\t" ) SHOW_STATUS( ENABLE_UNIT_TEST "unit tests\t\t\t" ) SHOW_STATUS( ENABLE_PERL "perl binary (test generated XML)" ) SHOW_STATUS( ENABLE_DIFF "diff binary (test generated XML)" ) Modified: wbxml2/trunk/tools/CMakeLists.txt ============================================================================== --- wbxml2/trunk/tools/CMakeLists.txt Mon May 11 14:24:30 2009 (r212) +++ wbxml2/trunk/tools/CMakeLists.txt Mon May 11 14:25:14 2009 (r213) @@ -6,7 +6,15 @@ cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) -ADD_EXECUTABLE( wbxml2xml wbxml2xml_tool.c attgetopt.c ) +CONFIGURE_FILE( "config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h") + +IF( LIBWBXML_POSIX_GETOPT ) + SET( ATTGETOPT "" ) +ELSE( LIBWBXML_POSIX_GETOPT ) + SET( ATTGETOPT "attgetopt.c" ) +ENDIF( LIBWBXML_POSIX_GETOPT ) + +ADD_EXECUTABLE( wbxml2xml wbxml2xml_tool.c ${ATTGETOPT} ) TARGET_LINK_LIBRARIES( wbxml2xml wbxml2 ) INSTALL( TARGETS wbxml2xml DESTINATION ${LIBWBXML_BIN_DIR} ) Modified: wbxml2/trunk/tools/getopt.h ============================================================================== --- wbxml2/trunk/tools/getopt.h Mon May 11 14:24:30 2009 (r212) +++ wbxml2/trunk/tools/getopt.h Mon May 11 14:25:14 2009 (r213) @@ -9,6 +9,15 @@ #ifndef WBXML_GETOPT_H #define WBXML_GETOPT_H +#include "tools/config.h" + +#ifdef FOUND_POSIX_GETOPT + +#include <unistd.h> +#define wbxml_getopt getopt + +#else /* FOUND_POSIX_GETOPT */ + int wbxml_getopt(int argc, char **argv, char *opts); extern int optind; /* useless variable @@ -16,4 +25,6 @@ */ extern char *optarg; +#endif /* FOUND_POSIX_GETOPT */ + #endif |
|
From: <svn...@op...> - 2009-05-11 12:24:35
|
Author: bellmich Date: Mon May 11 14:24:30 2009 New Revision: 212 URL: http://libwbxml.opensync.org/changeset/212 Log: more details about releasing Modified: wbxml2/trunk/RELEASE Modified: wbxml2/trunk/RELEASE ============================================================================== --- wbxml2/trunk/RELEASE Mon May 11 13:13:21 2009 (r211) +++ wbxml2/trunk/RELEASE Mon May 11 14:24:30 2009 (r212) @@ -35,9 +35,12 @@ - please run "svn status" before you continue to be 100 percent sure that there is no forgotten commit and no unrevisioned file. + - please run 'find . -name "svn-commit*.tmp" -print' to detect + waste from failed commits. + - once the commit succeeds, you have to create a new tag with "mkdir tags/libwbxml-$MAJOR.$MINOR.$PATCH", - "tar -C trunk --exclude=\"\\.svn\" -cf - . | tar -C tags/libwbxml-$MAJOR.$MINOR.$PATCH -xf -" + 'tar -C trunk --exclude="\.svn" -cf - . | tar -C tags/libwbxml-$MAJOR.$MINOR.$PATCH -xf -' "svn add tags/libwbxml-$MAJOR.$MINOR.$PATCH" and "svn commit tags/libwbxml-$MAJOR.$MINOR.$PATCH" (NEVER use "svn cp" because you must replace the external entities |
|
From: <svn...@op...> - 2009-05-11 11:13:34
|
Author: bellmich Date: Mon May 11 13:13:21 2009 New Revision: 211 URL: http://libwbxml.opensync.org/changeset/211 Log: commented out variable optopt - the variable is not used - the variable causes trouble on the Debian MIPS port Modified: wbxml2/trunk/tools/attgetopt.c wbxml2/trunk/tools/getopt.h Modified: wbxml2/trunk/tools/attgetopt.c ============================================================================== --- wbxml2/trunk/tools/attgetopt.c Fri Apr 24 16:48:41 2009 (r210) +++ wbxml2/trunk/tools/attgetopt.c Mon May 11 13:13:21 2009 (r211) @@ -27,7 +27,9 @@ #include <string.h> int optind = 1; +/* useless variable int optopt; +*/ char *optarg; int @@ -55,7 +57,10 @@ } + /* useless variable: optopt optopt = c = argv[optind][sp]; + */ + c = argv[optind][sp]; /* Check for invalid option */ if (c == ':' || (cp = strchr(opts, c)) == NULL) { Modified: wbxml2/trunk/tools/getopt.h ============================================================================== --- wbxml2/trunk/tools/getopt.h Fri Apr 24 16:48:41 2009 (r210) +++ wbxml2/trunk/tools/getopt.h Mon May 11 13:13:21 2009 (r211) @@ -11,7 +11,9 @@ int wbxml_getopt(int argc, char **argv, char *opts); extern int optind; +/* useless variable extern int optopt; +*/ extern char *optarg; #endif |
|
From: <svn...@op...> - 2009-05-09 18:49:53
|
Author: dgollub Date: Sat May 9 20:49:48 2009 New Revision: 5641 URL: http://www.opensync.org/changeset/5641 Log: Fix testcase member_configdir_deep_path, which got recently added. Allow deep member configuration directories Modified: trunk/opensync/group/opensync_member.c trunk/tests/group-tests/check_member.c Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Sat May 9 12:04:41 2009 (r5640) +++ trunk/opensync/group/opensync_member.c Sat May 9 20:49:48 2009 (r5641) @@ -518,7 +518,10 @@ osync_assert(member->configdir); if (!g_file_test(member->configdir, G_FILE_TEST_IS_DIR)) { - if (g_mkdir(member->configdir, 0700)) { + /* g_mkdir -> g_mkdir_with_parent: Regression testcase: + * member_configdir_deep_path + */ + if (g_mkdir_with_parents(member->configdir, 0700)) { osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %li\n", member->id); goto error; } Modified: trunk/tests/group-tests/check_member.c ============================================================================== --- trunk/tests/group-tests/check_member.c Sat May 9 12:04:41 2009 (r5640) +++ trunk/tests/group-tests/check_member.c Sat May 9 20:49:48 2009 (r5641) @@ -182,7 +182,6 @@ } END_TEST -/** TODO: are non-existant paths more than one directory deep acceptable? */ START_TEST (member_configdir_deep_path) { char *testbed = setup_testbed("filter_save_and_load"); |
|
From: <svn...@op...> - 2009-05-09 10:04:52
|
Author: dgollub Date: Sat May 9 12:04:41 2009 New Revision: 5640 URL: http://www.opensync.org/changeset/5640 Log: Changed contact mail address Modified: osynctool/trunk/tools/osynctool.c Modified: osynctool/trunk/tools/osynctool.c ============================================================================== --- osynctool/trunk/tools/osynctool.c Sat May 9 12:04:12 2009 (r5639) +++ osynctool/trunk/tools/osynctool.c Sat May 9 12:04:41 2009 (r5640) @@ -2,7 +2,7 @@ * osynctool - A command line client for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006-2007 Daniel Friedrich <dan...@op...> - * Copyright (C) 2008-2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2008-2009 Daniel Gollub <go...@b1...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |
|
From: <svn...@op...> - 2009-05-09 10:04:26
|
Author: dgollub Date: Sat May 9 12:04:12 2009 New Revision: 5639 URL: http://www.opensync.org/changeset/5639 Log: Changed contact mail address Modified: format-plugins/vformat/src/vformat-xmlformat.c format-plugins/vformat/src/xmlformat-common.c format-plugins/vformat/src/xmlformat-common.h format-plugins/vformat/src/xmlformat-recurrence.c format-plugins/vformat/src/xmlformat-recurrence.h format-plugins/vformat/src/xmlformat-vcalendar.c format-plugins/vformat/src/xmlformat-vcalendar.h format-plugins/vformat/src/xmlformat-vcard.c format-plugins/vformat/src/xmlformat-vcard.h format-plugins/vformat/src/xmlformat-vevent.c format-plugins/vformat/src/xmlformat-vevent.h format-plugins/vformat/src/xmlformat-vnote.c format-plugins/vformat/src/xmlformat-vnote.h format-plugins/xmlformat/trunk/src/xmlformat.c format-plugins/xmlformat/trunk/src/xmlformat.h format-plugins/xmlformat/trunk/src/xmlformat_compare.c format-plugins/xmlformat/trunk/tests/data/xmlformats/contact.xml format-plugins/xsltformat/AUTHORS format-plugins/xsltformat/src/xsltformat.c Modified: format-plugins/vformat/src/vformat-xmlformat.c ============================================================================== --- format-plugins/vformat/src/vformat-xmlformat.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/vformat-xmlformat.c Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * vformat-plugin - OpenSync plugin for vObject formats * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * Modified: format-plugins/vformat/src/xmlformat-common.c ============================================================================== --- format-plugins/vformat/src/xmlformat-common.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-common.c Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-common - common code for all xmlformat converter * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-common.h ============================================================================== --- format-plugins/vformat/src/xmlformat-common.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-common.h Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-common - common code for all xmlformat converter * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: format-plugins/vformat/src/xmlformat-recurrence.c ============================================================================== --- format-plugins/vformat/src/xmlformat-recurrence.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-recurrence.c Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-recurrence - common code for recurrence implementation * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-recurrence.h ============================================================================== --- format-plugins/vformat/src/xmlformat-recurrence.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-recurrence.h Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-recurrence - common code for recurrence implementation * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vcalendar.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vcalendar.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vcalendar.c Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-vcalendar - common code for vcalendar10|20, xmlformat-vevent, -vnote, -vtodo * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2007-2008 Christopher Stender <cst...@su...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vcalendar.h ============================================================================== --- format-plugins/vformat/src/xmlformat-vcalendar.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vcalendar.h Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-vcalendar - common code for vcalendar10|20, xmlformat-vevent, -vnote, -vtodo * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2007-2008 Christopher Stender <cst...@su...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vcard.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vcard.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vcard.c Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-vcard - convert vcard* to xmlformat-contact and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vcard.h ============================================================================== --- format-plugins/vformat/src/xmlformat-vcard.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vcard.h Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat-vcard - convert vcard* to xmlformat-contact and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vevent.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vevent.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vevent.c Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-vevent - convert vevent* to xmlformat-event and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * Modified: format-plugins/vformat/src/xmlformat-vevent.h ============================================================================== --- format-plugins/vformat/src/xmlformat-vevent.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vevent.h Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-vevent - convert vevent* to xmlformat-event and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * Modified: format-plugins/vformat/src/xmlformat-vnote.c ============================================================================== --- format-plugins/vformat/src/xmlformat-vnote.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vnote.c Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-vnote - convert vnote11 to xmlformat-note and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/vformat/src/xmlformat-vnote.h ============================================================================== --- format-plugins/vformat/src/xmlformat-vnote.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/vformat/src/xmlformat-vnote.h Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat-vnote - convert vnote11 to xmlformat-note and backwards * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/xmlformat/trunk/src/xmlformat.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xmlformat/trunk/src/xmlformat.c Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat - registration of xml object formats * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Jerry Yu <jij...@su...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * Modified: format-plugins/xmlformat/trunk/src/xmlformat.h ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat.h Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xmlformat/trunk/src/xmlformat.h Sat May 9 12:04:12 2009 (r5639) @@ -2,7 +2,7 @@ * xmlformat - registration of xml object formats * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Christopher Stender <cst...@su...> * * This library is free software; you can redistribute it and/or Modified: format-plugins/xmlformat/trunk/src/xmlformat_compare.c ============================================================================== --- format-plugins/xmlformat/trunk/src/xmlformat_compare.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xmlformat/trunk/src/xmlformat_compare.c Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ /* * xmlformat_compare - comparsion logic of xmlformat * Copyright (C) 2006 Daniel Friedrich <dan...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: format-plugins/xmlformat/trunk/tests/data/xmlformats/contact.xml ============================================================================== --- format-plugins/xmlformat/trunk/tests/data/xmlformats/contact.xml Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xmlformat/trunk/tests/data/xmlformats/contact.xml Sat May 9 12:04:12 2009 (r5639) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <contact> <EMail> - <Content>dg...@su...</Content> + <Content>go...@b1...</Content> </EMail> <FormattedName> <Content>Gollub Daniel</Content> Modified: format-plugins/xsltformat/AUTHORS ============================================================================== --- format-plugins/xsltformat/AUTHORS Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xsltformat/AUTHORS Sat May 9 12:04:12 2009 (r5639) @@ -1 +1 @@ -Daniel Gollub <dg...@su...> +Daniel Gollub <go...@b1...> Modified: format-plugins/xsltformat/src/xsltformat.c ============================================================================== --- format-plugins/xsltformat/src/xsltformat.c Sat May 9 12:02:23 2009 (r5638) +++ format-plugins/xsltformat/src/xsltformat.c Sat May 9 12:04:12 2009 (r5639) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2009 Daniel Gollub <go...@b1...> * Copyright (C) 2009 Instituto Nokia de Tecnologia * * This library is free software; you can redistribute it and/or |
|
From: <svn...@op...> - 2009-05-09 10:02:36
|
Author: dgollub Date: Sat May 9 12:02:23 2009 New Revision: 5638 URL: http://www.opensync.org/changeset/5638 Log: Changed contact mail address Modified: plugins/gnokii-sync/AUTHORS plugins/gnokii-sync/ChangeLog plugins/gnokii-sync/README plugins/gnokii-sync/src/gnokii_calendar.c plugins/gnokii-sync/src/gnokii_calendar.h plugins/gnokii-sync/src/gnokii_calendar_format.c plugins/gnokii-sync/src/gnokii_calendar_utils.c plugins/gnokii-sync/src/gnokii_calendar_utils.h plugins/gnokii-sync/src/gnokii_comm.c plugins/gnokii-sync/src/gnokii_comm.h plugins/gnokii-sync/src/gnokii_config.c plugins/gnokii-sync/src/gnokii_config.h plugins/gnokii-sync/src/gnokii_contact.c plugins/gnokii-sync/src/gnokii_contact.h plugins/gnokii-sync/src/gnokii_contact_format.c plugins/gnokii-sync/src/gnokii_contact_utils.c plugins/gnokii-sync/src/gnokii_contact_utils.h plugins/gnokii-sync/src/gnokii_sync.c plugins/gnokii-sync/src/gnokii_sync.h Modified: plugins/gnokii-sync/AUTHORS ============================================================================== --- plugins/gnokii-sync/AUTHORS Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/AUTHORS Sat May 9 12:02:23 2009 (r5638) @@ -1 +1 @@ -Daniel Gollub <dg...@su...> +Daniel Gollub <go...@b1...> Modified: plugins/gnokii-sync/ChangeLog ============================================================================== --- plugins/gnokii-sync/ChangeLog Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/ChangeLog Sat May 9 12:02:23 2009 (r5638) @@ -1,19 +1,19 @@ -2007-06-07 Daniel Gollub <dg...@su...> +2007-06-07 Daniel Gollub <go...@b1...> * inital port of gnokii-sync to OpenSync 0.30 API (still not working!) * changed build environment to scons * updated README / INSTALL -2006-08-15 Daniel Gollub <dg...@su...> +2006-08-15 Daniel Gollub <go...@b1...> * modified hash functions (update leads to different hash results!) * fixed serveral memory leaks * replaced privacy function with TRACE_SENSITIVE -2006-05-26 Daniel Gollub <dg...@su...> +2006-05-26 Daniel Gollub <go...@b1...> * added configure parameters --disable-event --disable-contact -2006-05-20 Daniel Gollub <dg...@su...> +2006-05-20 Daniel Gollub <go...@b1...> * gnokii_contact_utils.c gnokii_contact_utils.h @@ -24,14 +24,14 @@ - clean telephone numbers (only +*#pw[0-9] allowed) - evo2-sync workaround for name -2006-05-19 Daniel Gollub <dg...@su...> +2006-05-19 Daniel Gollub <go...@b1...> * updated README / INSTALL * gnokii-sync contact support is actived by default!!! - EXPERIMENTAL. Don't forget your backup! -2006-05-01 Daniel Gollub <dg...@su...> +2006-05-01 Daniel Gollub <go...@b1...> * gnokii_format.c - stores gnokii-format information @@ -49,7 +49,7 @@ * extended sync/disconnect/get_changeinfo/get_data/commit/read timeout to 10000. (Thanks to mmeyer!) -2006-03-12 Daniel Gollub <dg...@su...> +2006-03-12 Daniel Gollub <go...@b1...> * fixed several memory leaks @@ -67,7 +67,7 @@ * added destroy function for event format (calendar) -2006-02-27 Daniel Gollub <dg...@su...> +2006-02-27 Daniel Gollub <go...@b1...> * Initial version of gnokii-sync Modified: plugins/gnokii-sync/README ============================================================================== --- plugins/gnokii-sync/README Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/README Sat May 9 12:02:23 2009 (r5638) @@ -28,7 +28,7 @@ Let me know if this works for your cellphone. (And what doesn't work :)) -<dg...@su...> +<go...@b1...> BUGS/KNOWN PROBLEMS: Modified: plugins/gnokii-sync/src/gnokii_calendar.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_calendar.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_calendar.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_calendar.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_calendar.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_calendar.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_calendar_format.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_calendar_format.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_calendar_format.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_calendar_utils.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_calendar_utils.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_calendar_utils.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_calendar_utils.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_calendar_utils.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_calendar_utils.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_comm.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_comm.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_comm.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_comm.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_comm.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_comm.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_config.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_config.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_config.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_config.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_config.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_config.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_contact.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_contact.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_contact.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_contact.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_contact.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_contact.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_contact_format.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_contact_format.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_contact_format.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_contact_utils.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_contact_utils.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_contact_utils.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_contact_utils.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_contact_utils.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_contact_utils.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_sync.c ============================================================================== --- plugins/gnokii-sync/src/gnokii_sync.c Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_sync.c Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * Modified: plugins/gnokii-sync/src/gnokii_sync.h ============================================================================== --- plugins/gnokii-sync/src/gnokii_sync.h Sat May 9 11:59:56 2009 (r5637) +++ plugins/gnokii-sync/src/gnokii_sync.h Sat May 9 12:02:23 2009 (r5638) @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006 by Daniel Gollub * - * <dg...@su...> * + * <go...@b1...> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * |
Author: dgollub Date: Sat May 9 11:59:56 2009 New Revision: 5637 URL: http://www.opensync.org/changeset/5637 Log: Changed contact mail address Modified: trunk/ChangeLog trunk/cmake/CMakeLists.txt trunk/cmake/OpenSyncDefaults.cmake trunk/cmake/OpenSyncPlatforms.cmake trunk/docs/whitepaper/OpenSync.tex trunk/opensync/archive/opensync_archive_private.h trunk/opensync/common/opensync_common_internals.h trunk/opensync/common/opensync_thread_internals.h trunk/opensync/db/opensync_db.c trunk/opensync/db/opensync_db_internals.h trunk/opensync/db/opensync_db_private.h trunk/opensync/engine/opensync_engine.c trunk/opensync/engine/opensync_engine.h trunk/opensync/engine/opensync_mapping_engine.h trunk/opensync/engine/opensync_mapping_engine_internals.h trunk/opensync/engine/opensync_mapping_entry_engine.h trunk/opensync/engine/opensync_sink_engine.h trunk/opensync/format/opensync_objformat_sink.c trunk/opensync/format/opensync_objformat_sink.h trunk/opensync/format/opensync_objformat_sink_private.h trunk/opensync/format/opensync_time.c trunk/opensync/format/opensync_time.h trunk/opensync/format/opensync_time_internals.h trunk/opensync/format/opensync_time_private.h trunk/opensync/group/opensync_group_internals.h trunk/opensync/group/opensync_updater.c trunk/opensync/group/opensync_updater.h trunk/opensync/group/opensync_updater_internals.h trunk/opensync/group/opensync_updater_private.h trunk/opensync/helper/opensync_hashtable.c trunk/opensync/helper/opensync_hashtable.h trunk/opensync/helper/opensync_hashtable_internals.h trunk/opensync/helper/opensync_hashtable_private.h trunk/opensync/opensync-common.h trunk/opensync/opensync-db.h trunk/opensync/opensync-debug.h trunk/opensync/opensync-time.h trunk/opensync/plugin/opensync_plugin_advancedoptions.c trunk/opensync/plugin/opensync_plugin_advancedoptions.h trunk/opensync/plugin/opensync_plugin_advancedoptions_private.h trunk/opensync/plugin/opensync_plugin_authentication.c trunk/opensync/plugin/opensync_plugin_authentication.h trunk/opensync/plugin/opensync_plugin_authentication_private.h trunk/opensync/plugin/opensync_plugin_config.c trunk/opensync/plugin/opensync_plugin_config.h trunk/opensync/plugin/opensync_plugin_config_private.h trunk/opensync/plugin/opensync_plugin_connection.c trunk/opensync/plugin/opensync_plugin_connection.h trunk/opensync/plugin/opensync_plugin_connection_internals.h trunk/opensync/plugin/opensync_plugin_connection_private.h trunk/opensync/plugin/opensync_plugin_localization.c trunk/opensync/plugin/opensync_plugin_localization.h trunk/opensync/plugin/opensync_plugin_localization_private.h trunk/opensync/plugin/opensync_plugin_resource.c trunk/opensync/plugin/opensync_plugin_resource.h trunk/opensync/plugin/opensync_plugin_resource_private.h trunk/tests/abiapi-tests/check-symbols trunk/tests/data/xmlformats/contact.xml trunk/tools/osyncplugin.c Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Sat May 9 11:58:01 2009 (r5636) +++ trunk/ChangeLog Sat May 9 11:59:56 2009 (r5637) @@ -167,7 +167,7 @@ Avoid use of g_hash_table_get_keys so code can be built using glib 2.12. Uses g_hash_table_foreach with a callback routine instead. -2008-04-12 Daniel Gollub <dg...@su...> +2008-04-12 Daniel Gollub <go...@b1...> * tools/osyncplugin.c: Full rewrite of osyncplugin to work with OpenSync 0.30 API Modified: trunk/cmake/CMakeLists.txt ============================================================================== --- trunk/cmake/CMakeLists.txt Sat May 9 11:58:01 2009 (r5636) +++ trunk/cmake/CMakeLists.txt Sat May 9 11:59:56 2009 (r5637) @@ -1,4 +1,4 @@ -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/OpenSyncInternal.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/OpenSyncInternal.cmake" @ONLY ) Modified: trunk/cmake/OpenSyncDefaults.cmake ============================================================================== --- trunk/cmake/OpenSyncDefaults.cmake Sat May 9 11:58:01 2009 (r5636) +++ trunk/cmake/OpenSyncDefaults.cmake Sat May 9 11:59:56 2009 (r5637) @@ -17,7 +17,7 @@ # OPENSYNC_DEBUG_MODULES True if modules shouldn't get unloaded by OpenSync, to keep symbols of plugins # OPENSYNC_UNITTESTS True if unit tests should be build # -# Copyright (c) 2007-2008 Daniel Gollub <dg...@su...> +# Copyright (c) 2007-2008 Daniel Gollub <go...@b1...> # INCLUDE( OpenSyncPlatforms ) Modified: trunk/cmake/OpenSyncPlatforms.cmake ============================================================================== --- trunk/cmake/OpenSyncPlatforms.cmake Sat May 9 11:58:01 2009 (r5636) +++ trunk/cmake/OpenSyncPlatforms.cmake Sat May 9 11:59:56 2009 (r5637) @@ -1,4 +1,4 @@ -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # OpenSync platform macros: Modified: trunk/docs/whitepaper/OpenSync.tex ============================================================================== --- trunk/docs/whitepaper/OpenSync.tex Sat May 9 11:58:01 2009 (r5636) +++ trunk/docs/whitepaper/OpenSync.tex Sat May 9 11:59:56 2009 (r5637) @@ -38,7 +38,7 @@ \author{ %Armin Bauer <abauer@>\\ % TODO: ask for permission -Daniel Gollub <dg...@su...>\\ +Daniel Gollub <go...@b1...>\\ } \title{\huge{OpenSync}\\\large{A Synchronization Framework}} Modified: trunk/opensync/archive/opensync_archive_private.h ============================================================================== --- trunk/opensync/archive/opensync_archive_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/archive/opensync_archive_private.h Sat May 9 11:59:56 2009 (r5637) @@ -2,7 +2,7 @@ * libopensync - A synchronization framework * Copyright (C) 2006 Armin Bauer <arm...@op...> * Copyright (C) 2006 NetNix Finland Ltd <ne...@ne...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/common/opensync_common_internals.h ============================================================================== --- trunk/opensync/common/opensync_common_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/common/opensync_common_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2009 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/common/opensync_thread_internals.h ============================================================================== --- trunk/opensync/common/opensync_thread_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/common/opensync_thread_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2009 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/db/opensync_db.c ============================================================================== --- trunk/opensync/db/opensync_db.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/db/opensync_db.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2006 Daniel Gollub <dg...@su...> + * Copyright (C) 2006 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/db/opensync_db_internals.h ============================================================================== --- trunk/opensync/db/opensync_db_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/db/opensync_db_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2006 Daniel Gollub <dg...@su...> + * Copyright (C) 2006 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/db/opensync_db_private.h ============================================================================== --- trunk/opensync/db/opensync_db_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/db/opensync_db_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2006 Daniel Gollub <dg...@su...> + * Copyright (C) 2006 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_engine.c Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization engine for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007-2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2007-2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_engine.h ============================================================================== --- trunk/opensync/engine/opensync_engine.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_engine.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization engine for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_mapping_engine.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_mapping_engine.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2006 Armin Bauer <arm...@de...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_mapping_engine_internals.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_mapping_engine_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libosengine - A synchronization engine for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_mapping_entry_engine.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_entry_engine.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_mapping_entry_engine.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libosengine - A synchronization engine for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/engine/opensync_sink_engine.h ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/engine/opensync_sink_engine.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync- A synchronization engine for the opensync framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2009 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/format/opensync_objformat_sink.c ============================================================================== --- trunk/opensync/format/opensync_objformat_sink.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_objformat_sink.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/format/opensync_objformat_sink.h ============================================================================== --- trunk/opensync/format/opensync_objformat_sink.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_objformat_sink.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/format/opensync_objformat_sink_private.h ============================================================================== --- trunk/opensync/format/opensync_objformat_sink_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_objformat_sink_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/format/opensync_time.c ============================================================================== --- trunk/opensync/format/opensync_time.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_time.c Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2008 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Chris Frey <cd...@ne...> * * This library is free software; you can redistribute it and/or Modified: trunk/opensync/format/opensync_time.h ============================================================================== --- trunk/opensync/format/opensync_time.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_time.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2008 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Chris Frey <cd...@ne...> * * This library is free software; you can redistribute it and/or Modified: trunk/opensync/format/opensync_time_internals.h ============================================================================== --- trunk/opensync/format/opensync_time_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_time_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> -* Copyright (C) 2006-2008 Daniel Gollub <dg...@su...> +* Copyright (C) 2006-2008 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Chris Frey <cd...@ne...> * * This library is free software; you can redistribute it and/or Modified: trunk/opensync/format/opensync_time_private.h ============================================================================== --- trunk/opensync/format/opensync_time_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/format/opensync_time_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2008 Daniel Gollub <go...@b1...> * Copyright (C) 2007 Chris Frey <cd...@ne...> * * This library is free software; you can redistribute it and/or Modified: trunk/opensync/group/opensync_group_internals.h ============================================================================== --- trunk/opensync/group/opensync_group_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/group/opensync_group_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2006 Armin Bauer <arm...@de...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/group/opensync_updater.c ============================================================================== --- trunk/opensync/group/opensync_updater.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/group/opensync_updater.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/group/opensync_updater.h ============================================================================== --- trunk/opensync/group/opensync_updater.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/group/opensync_updater.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/group/opensync_updater_internals.h ============================================================================== --- trunk/opensync/group/opensync_updater_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/group/opensync_updater_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/group/opensync_updater_private.h ============================================================================== --- trunk/opensync/group/opensync_updater_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/group/opensync_updater_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/helper/opensync_hashtable.c ============================================================================== --- trunk/opensync/helper/opensync_hashtable.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/helper/opensync_hashtable.c Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/helper/opensync_hashtable.h ============================================================================== --- trunk/opensync/helper/opensync_hashtable.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/helper/opensync_hashtable.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/helper/opensync_hashtable_internals.h ============================================================================== --- trunk/opensync/helper/opensync_hashtable_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/helper/opensync_hashtable_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/helper/opensync_hashtable_private.h ============================================================================== --- trunk/opensync/helper/opensync_hashtable_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/helper/opensync_hashtable_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/opensync-common.h ============================================================================== --- trunk/opensync/opensync-common.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/opensync-common.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2009 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/opensync-db.h ============================================================================== --- trunk/opensync/opensync-db.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/opensync-db.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2006 Daniel Gollub <dg...@su...> + * Copyright (C) 2006 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/opensync-debug.h ============================================================================== --- trunk/opensync/opensync-debug.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/opensync-debug.h Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ /* * libopensync - A synchronization framework * Copyright (C) 2004-2005 Armin Bauer <arm...@op...> - * Copyright (C) 2006-2009 Daniel Gollub <dg...@su...> + * Copyright (C) 2006-2009 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/opensync-time.h ============================================================================== --- trunk/opensync/opensync-time.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/opensync-time.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2007 Daniel Gollub <dg...@su...> + * Copyright (C) 2007 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_advancedoptions.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_advancedoptions.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_advancedoptions.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_advancedoptions.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_advancedoptions.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_advancedoptions.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_advancedoptions_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_advancedoptions_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_advancedoptions_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_authentication.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_authentication.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_authentication.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_authentication.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_authentication.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_authentication.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_authentication_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_authentication_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_authentication_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_config.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_config.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_config.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_config.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_config_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_config_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_connection.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_connection.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_connection.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_connection.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_connection.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_connection.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_connection_internals.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_connection_internals.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_connection_internals.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_connection_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_connection_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_connection_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_localization.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_localization.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_localization.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_localization.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_localization.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_localization.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_localization_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_localization_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_localization_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_resource.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_resource.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_resource.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_resource.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_resource.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_resource.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/opensync/plugin/opensync_plugin_resource_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_resource_private.h Sat May 9 11:58:01 2009 (r5636) +++ trunk/opensync/plugin/opensync_plugin_resource_private.h Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * libopensync - A synchronization framework - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/tests/abiapi-tests/check-symbols ============================================================================== --- trunk/tests/abiapi-tests/check-symbols Sat May 9 11:58:01 2009 (r5636) +++ trunk/tests/abiapi-tests/check-symbols Sat May 9 11:59:56 2009 (r5637) @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2008 Daniel Gollub <dg...@su...> +# Copyright (c) 2008 Daniel Gollub <go...@b1...> SYMBOLS=opensync.sym Modified: trunk/tests/data/xmlformats/contact.xml ============================================================================== --- trunk/tests/data/xmlformats/contact.xml Sat May 9 11:58:01 2009 (r5636) +++ trunk/tests/data/xmlformats/contact.xml Sat May 9 11:59:56 2009 (r5637) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <contact> <EMail> - <Content>dg...@su...</Content> + <Content>go...@b1...</Content> </EMail> <FormattedName> <Content>Gollub Daniel</Content> Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Sat May 9 11:58:01 2009 (r5636) +++ trunk/tools/osyncplugin.c Sat May 9 11:59:56 2009 (r5637) @@ -1,6 +1,6 @@ /* * osyncplugin - swiss-knife for testing OpenSync synchronization plugins - * Copyright (C) 2008 Daniel Gollub <dg...@su...> + * Copyright (C) 2008 Daniel Gollub <go...@b1...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public |
|
From: <svn...@op...> - 2009-05-09 09:58:21
|
Author: dgollub Date: Sat May 9 11:58:01 2009 New Revision: 5636 URL: http://www.opensync.org/changeset/5636 Log: Changed (C) contact mail address Modified: branches/3rd-party-cmake-modules/modules/Compiler.cmake branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake branches/3rd-party-cmake-modules/modules/FindCheck.cmake branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake branches/3rd-party-cmake-modules/modules/FindGConf2.cmake branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake branches/3rd-party-cmake-modules/modules/FindGNOKII.cmake branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake branches/3rd-party-cmake-modules/modules/FindKDEPIM3.cmake branches/3rd-party-cmake-modules/modules/FindLibExslt.cmake branches/3rd-party-cmake-modules/modules/FindLibGlade.cmake branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake branches/3rd-party-cmake-modules/modules/FindORBit2.cmake branches/3rd-party-cmake-modules/modules/FindOpenObex.cmake branches/3rd-party-cmake-modules/modules/FindOpenSync.cmake branches/3rd-party-cmake-modules/modules/FindPilotLink.cmake branches/3rd-party-cmake-modules/modules/FindSqlite3.cmake Modified: branches/3rd-party-cmake-modules/modules/Compiler.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/Compiler.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/Compiler.cmake Sat May 9 11:58:01 2009 (r5636) @@ -1,4 +1,4 @@ -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> IF ( CMAKE_COMPILER_IS_GNUCC ) SET( SYMBOLS_VISIBILITY "-fvisibility=hidden" ) Modified: branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # BONOBO2_DEFINITIONS Definitions to compile bonobo2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # BONOBOACTIVATION2_DEFINITIONS Definitions to compile bonobo-activation-2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake Sat May 9 11:58:01 2009 (r5636) @@ -5,7 +5,7 @@ # BLUEZ_INCLUDE_DIRS Location of BlueZ headers # BLUEZ_LIBRARIES List of libaries to use BlueZ # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007-2009 Bjoern Ricks <bjo...@gm...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindCheck.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindCheck.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindCheck.cmake Sat May 9 11:58:01 2009 (r5636) @@ -5,7 +5,7 @@ # CHECK_INCLUDE_DIRS - the check include directory # CHECK_LIBRARIES - check library # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007-2009 Bjoern Ricks <bjo...@gm...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEBOOK1.0_DEFINITIONS Definitions to compile libebook1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEBOOK1.2_DEFINITIONS Definitions to compile libebook1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBECAL1.0_DEFINITIONS Definitions to compile libecal1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBECAL1.2_DEFINITIONS Definitions to compile libecal1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATABOOK1.0_DEFINITIONS Definitions to compile libedatabook1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATABOOK1.2_DEFINITIONS Definitions to compile libedatabook1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATACAL1.0_DEFINITIONS Definitions to compile libedatacal1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATACAL1.2_DEFINITIONS Definitions to compile libedatacal1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATASERVER1.0_DEFINITIONS Definitions to compile libedataserver1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBEDATASERVER1.2_DEFINITIONS Definitions to compile libedataserver1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # EVOLUTIONDATASERVER1.0_DEFINITIONS Definitions to compile evolutiondataserver1.0 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # EVOLUTIONDATASERVER1.2_DEFINITIONS Definitions to compile evolutiondataserver1.2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindGConf2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindGConf2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindGConf2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # GCONF2_DEFINITIONS Definitions to compile gconf2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -10,7 +10,7 @@ # # Copyright (c) 2006 Andreas Schneider <ma...@cy...> # Copyright (c) 2006 Philippe Bernery <phi...@gm...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # Copyright (c) 2008 Michael Bell <mic...@we...> # Copyright (c) 2008-2009 Bjoern Ricks <bjo...@go...> Modified: branches/3rd-party-cmake-modules/modules/FindGNOKII.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindGNOKII.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindGNOKII.cmake Sat May 9 11:58:01 2009 (r5636) @@ -6,7 +6,7 @@ # GNOKII_LIBRARIES List of libaries to use GNOKII # GNOKII_DEFINITIONS Definitions to compile GNOKII # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2008 Bjoern Ricks <bjo...@go...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # GNOMEVFS2_DEFINITIONS Definitions to compile gnomevfs2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindKDEPIM3.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindKDEPIM3.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindKDEPIM3.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # KDEPIM3_KABC_LIBRARIES List of libaries to use KCAL of KDEPIM3 # KDEPIM3_DEFINITIONS Definitions to compile KDEPIM3 # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # # Redistribution and use is allowed according to the terms of the New # BSD license. Modified: branches/3rd-party-cmake-modules/modules/FindLibExslt.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibExslt.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibExslt.cmake Sat May 9 11:58:01 2009 (r5636) @@ -5,7 +5,7 @@ # LIBEXSLT_INCLUDE_DIRS Location of libexslt headers # LIBEXSLT_LIBRARIES List of libaries to use libexslt # -# Copyright (c) 2008 Daniel Gollub <dg...@su...> +# Copyright (c) 2008 Daniel Gollub <go...@b1...> # Copyright (c) 2008 Bjoern Ricks <bjo...@go...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindLibGlade.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibGlade.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibGlade.cmake Sat May 9 11:58:01 2009 (r5636) @@ -6,7 +6,7 @@ # LIBGLADE_LIBRARIES List of libaries to use LIBGLADE # LIBGLADE_DEFINITIONS Definitions to compile LIBGLADE # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2008 Daniel Friedrich <dan...@op...> # Copyright (c) 2008 Bjoern Ricks <bjo...@go...> # Modified: branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # LIBGNOME2_DEFINITIONS Definitions to compile libgnome2 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -34,7 +34,7 @@ # In this situation you have to set LIBSPOUP24_MIN_VERSION also. # The same applies to LIBSPOUP24_MIN_VERSION and libsoup2.2. # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2008 Bjoern Ricks <bjo...@gm...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake Sat May 9 11:58:01 2009 (r5636) @@ -6,7 +6,7 @@ # LIBSYNCML_LIBRARIES List of libaries to use libsyncml # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -5,7 +5,7 @@ # LIBWBXML2_INCLUDE_DIRS Location of libwbxml headers # LIBWBXML2_LIBRARIES List of libaries to use libwbxml # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Bjoern Ricks <b....@fh...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindORBit2.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindORBit2.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindORBit2.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # ORBIT2_DEFINITIONS Definitions to compile orbit # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindOpenObex.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindOpenObex.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindOpenObex.cmake Sat May 9 11:58:01 2009 (r5636) @@ -6,7 +6,7 @@ # OPENOBEX_LIBRARIES List of libaries to use OpenObex # OPENOBEX_HAVE_TCPOBEX OpenObex supports Tcp over Obex # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007-2008 Bjoern Ricks <bjo...@go...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindOpenSync.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindOpenSync.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindOpenSync.cmake Sat May 9 11:58:01 2009 (r5636) @@ -5,7 +5,7 @@ # OPENSYNC_INCLUDE_DIRS Location of OpenSync headers # OPENSYNC_LIBRARIES List of libaries to use OpenSync # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # Copyright (c) 2008 Bjoern Ricks <bjo...@go...> # Modified: branches/3rd-party-cmake-modules/modules/FindPilotLink.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindPilotLink.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindPilotLink.cmake Sat May 9 11:58:01 2009 (r5636) @@ -6,7 +6,7 @@ # PILOTLINK_LIBRARIES List of libaries to use PilotLink # PILOTLINK_DEFINITIONS Definitions to compile PilotLink # -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2008 Bjoern Ricks <bjo...@go...> # # Redistribution and use is allowed according to the terms of the New Modified: branches/3rd-party-cmake-modules/modules/FindSqlite3.cmake ============================================================================== --- branches/3rd-party-cmake-modules/modules/FindSqlite3.cmake Tue May 5 11:06:16 2009 (r5635) +++ branches/3rd-party-cmake-modules/modules/FindSqlite3.cmake Sat May 9 11:58:01 2009 (r5636) @@ -7,7 +7,7 @@ # SQLITE3_DEFINITIONS Definitions to compile sqlite3 # # Copyright (c) 2007 Juha Tuomala <tu...@ik...> -# Copyright (c) 2007 Daniel Gollub <dg...@su...> +# Copyright (c) 2007 Daniel Gollub <go...@b1...> # Copyright (c) 2007 Alban Browaeys <pr...@ya...> # # Redistribution and use is allowed according to the terms of the New |
|
From: <svn...@op...> - 2009-05-05 12:11:13
|
Author: bellmich Date: Tue May 5 14:11:08 2009 New Revision: 1081 URL: http://libsyncml.opensync.org/changeset/1081 Log: copied some comments from libwbxml Modified: trunk/RELEASE Modified: trunk/RELEASE ============================================================================== --- trunk/RELEASE Thu Apr 30 17:00:20 2009 (r1080) +++ trunk/RELEASE Tue May 5 14:11:08 2009 (r1081) @@ -32,6 +32,12 @@ - if someone else made changes and the commit fails, you have to "svn up" and run the tests again + - please run "svn status" before you continue to be 100 percent sure + that there is no forgotten commit and no unrevisioned file. + + - please run 'find . -name "svn-commit*.tmp" -print' to detect + waste from failed commits. + - once the commit succeeds, you have to create a new tag with "mkdir tags/libsyncml-$MAJOR.$MINOR.$PATCH", "tar -C trunk --exclude=\"\\.svn\" -cf - . | tar -C tags/libsyncml-$MAJOR.$MINOR.$PATCH -xf -" |
|
From: <svn...@op...> - 2009-05-05 09:06:33
|
Author: bellmich Date: Tue May 5 11:06:16 2009 New Revision: 5635 URL: http://www.opensync.org/changeset/5635 Log: committed patch from nicklas in ticket #1111 (fixes problems with more than one concurrent evolution data store like memo, task and todo) Modified: plugins/evolution2/src/evolution2_ecal.c plugins/evolution2/src/evolution2_sync.h Modified: plugins/evolution2/src/evolution2_ecal.c ============================================================================== --- plugins/evolution2/src/evolution2_ecal.c Wed Apr 29 14:15:50 2009 (r5634) +++ plugins/evolution2/src/evolution2_ecal.c Tue May 5 11:06:16 2009 (r5635) @@ -98,7 +98,7 @@ osync_error_set(&error, OSYNC_ERROR_GENERIC, "Anchor missing for objtype \"%s\"", osync_objtype_sink_get_name(sink)); goto error_free_cal; } - if (!osync_sink_state_equal(state_db, "uri", evo_cal->uri, &state_match, &error)) { + if (!osync_sink_state_equal(state_db, evo_cal->uri_key, evo_cal->uri, &state_match, &error)) { osync_error_set(&error, OSYNC_ERROR_GENERIC, "Anchor comparison failed for objtype \"%s\"", osync_objtype_sink_get_name(sink)); goto error_free_cal; } @@ -151,7 +151,7 @@ osync_error_set(&error, OSYNC_ERROR_GENERIC, "State database missing for objtype \"%s\"", osync_objtype_sink_get_name(sink)); goto error; } - if (!osync_sink_state_set(state_db, "uri", evo_cal->uri, &error)) + if (!osync_sink_state_set(state_db, evo_cal->uri_key, evo_cal->uri, &error)) goto error; GList *changes = NULL; @@ -397,6 +397,7 @@ osync_bool evo2_ecal_initialize(OSyncEvoEnv *env, OSyncPluginInfo *info, const char *objtype, const char *required_format, OSyncError **error) { + char *uri_key; osync_assert(env); osync_assert(info); @@ -428,6 +429,14 @@ OSyncPluginConfig *config = osync_plugin_info_get_config(info); OSyncPluginResource *resource = osync_plugin_config_find_active_resource(config, objtype); + + const int size = strlen(STR_URI_KEY) + strlen(objtype) + 1; + + uri_key = malloc(size * sizeof(char)); + + snprintf(uri_key, size, "%s%s", STR_URI_KEY, objtype); + + cal->uri_key = uri_key; cal->uri = osync_plugin_resource_get_url(resource); if(!cal->uri) { osync_error_set(error,OSYNC_ERROR_GENERIC, "%s url not set", objtype); Modified: plugins/evolution2/src/evolution2_sync.h ============================================================================== --- plugins/evolution2/src/evolution2_sync.h Wed Apr 29 14:15:50 2009 (r5634) +++ plugins/evolution2/src/evolution2_sync.h Tue May 5 11:06:16 2009 (r5635) @@ -40,12 +40,16 @@ #define e_cal_component_get_recurid_as_string() See_evolution2_sync_h_for_note +#define STR_URI_KEY "uri_" + + typedef struct evo2_location { char *name; char *uri; } evo2_location; typedef struct OSyncEvoCalendar { + const char *uri_key; const char *uri; const char *objtype; const char *change_id; |
|
From: <svn...@op...> - 2009-04-30 15:00:24
|
Author: bellmich Date: Thu Apr 30 17:00:20 2009 New Revision: 1080 URL: http://libsyncml.opensync.org/changeset/1080 Log: The getAlertTypeCallback should only be called once per data store. Modified: trunk/libsyncml/data_sync_api/data_sync_client.c trunk/libsyncml/data_sync_api/transport_http_client.c Modified: trunk/libsyncml/data_sync_api/data_sync_client.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_client.c Thu Apr 30 14:59:55 2009 (r1079) +++ trunk/libsyncml/data_sync_api/data_sync_client.c Thu Apr 30 17:00:20 2009 (r1080) @@ -182,6 +182,11 @@ if (*error) goto error; } + if (alertType == SML_ALERT_UNKNOWN) + { + smlTrace(TRACE_INTERNAL, "%s: no alert type => slow-sync", __func__); + alertType == SML_ALERT_SLOW_SYNC; + } if (alertType != SML_ALERT_SLOW_SYNC) { /* this must be a two-way-sync */ Modified: trunk/libsyncml/data_sync_api/transport_http_client.c ============================================================================== --- trunk/libsyncml/data_sync_api/transport_http_client.c Thu Apr 30 14:59:55 2009 (r1079) +++ trunk/libsyncml/data_sync_api/transport_http_client.c Thu Apr 30 17:00:20 2009 (r1080) @@ -146,19 +146,7 @@ for (; o; o = o->next) { SmlDataSyncDatastore *datastore = o->data; - SmlAlertType alertType = SML_ALERT_SLOW_SYNC; - if (dsObject->getAlertTypeCallback) - { - alertType = dsObject->getAlertTypeCallback( - dsObject, - datastore->sourceUri, - SML_ALERT_UNKNOWN, - dsObject->getAlertTypeUserdata, - error); - if (*error) - goto error; - } - if (!smlDataSyncClientSendAlert(datastore, alertType, error)) + if (!smlDataSyncClientSendAlert(datastore, SML_ALERT_UNKNOWN, error)) goto error; } smlTrace(TRACE_INTERNAL, "%s: all datastores created their alerts", __func__); |
|
From: <svn...@op...> - 2009-04-30 13:00:00
|
Author: bellmich Date: Thu Apr 30 14:59:55 2009 New Revision: 1079 URL: http://libsyncml.opensync.org/changeset/1079 Log: The requested remote alert type is unknown and so let's signal this to the library user. Modified: trunk/libsyncml/data_sync_api/transport_http_client.c Modified: trunk/libsyncml/data_sync_api/transport_http_client.c ============================================================================== --- trunk/libsyncml/data_sync_api/transport_http_client.c Thu Apr 30 11:55:50 2009 (r1078) +++ trunk/libsyncml/data_sync_api/transport_http_client.c Thu Apr 30 14:59:55 2009 (r1079) @@ -152,7 +152,7 @@ alertType = dsObject->getAlertTypeCallback( dsObject, datastore->sourceUri, - SML_ALERT_TWO_WAY, + SML_ALERT_UNKNOWN, dsObject->getAlertTypeUserdata, error); if (*error) |
