Changeset 2524

Timestamp:

09/18/07 20:54:33 (1 year ago)

Author:

dfriedrich

Message:

-removed the osync_member_set_start_type()- and osync_member_get_start_type()-function because this value belongs to osync_plugin

Files:

• trunk/opensync/engine/opensync_engine.c (modified) (1 diff)
• trunk/opensync/group/opensync_member.c (modified) (1 diff)
• trunk/opensync/group/opensync_member.h (modified) (1 diff)
• trunk/tests/engine-tests/check_engine.c (modified) (14 diffs)
• trunk/tests/engine-tests/check_engine_error.c (modified) (10 diffs)
• trunk/wrapper/opensync-group.i (modified) (1 diff)

trunk/opensync/engine/opensync_engine.c

@@ -675 +675 @@
-        osync_client_proxy_set_change_callback(proxy, _osync_engine_receive_change, engine);
-
-        /* Set Member start type to his plugin start type. Redudant - isn't it?
-           FIXME: get rid of osync_member_get_start_type() / osync_member_set_start_type() */
-        osync_member_set_start_type(member, osync_plugin_get_start_type(plugin));
-
-        if (!osync_client_proxy_spawn(proxy, osync_plugin_get_start_type(plugin), osync_member_get_configdir(member), error))
-                goto error_free_proxy;

trunk/opensync/group/opensync_member.c

@@ -735 +735 @@
-}
-
-
-/** @brief Set the start type for this member
- * 
- * @param member The member
- * @param type The plugin start type
- */
-void osync_member_set_start_type(OSyncMember *member, OSyncStartType type)
-{
-        osync_assert(member);
-        member->starttype = type;
-}
-
-/** @brief Get the start type for this member
- * 
- * @param member The member
- * @returns Return the start type of this member
- */
-OSyncStartType osync_member_get_start_type(OSyncMember *member)
-{
-        osync_assert(member);
-        return member->starttype;
-}
-
-/** @brief Get the capabilities of the member 
- * 

trunk/opensync/group/opensync_member.h

@@ -54 +54 @@
-OSYNC_EXPORT void osync_member_set_objtype_enabled(OSyncMember *member, const char *objtype, osync_bool enabled);
-
-OSYNC_EXPORT void osync_member_set_start_type(OSyncMember *member, OSyncStartType type);
-OSYNC_EXPORT OSyncStartType osync_member_get_start_type(OSyncMember *member);
-
-OSYNC_EXPORT const OSyncList *osync_member_get_objformats(OSyncMember *member, const char *objtype, OSyncError **error);
-OSYNC_EXPORT void osync_member_add_objformat(OSyncMember *member, const char *objtype, const char *format);

trunk/tests/engine-tests/check_engine.c

@@ -210 +210 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        
@@ -221 +221 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        
@@ -518 +518 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        osync_member_add_objtype(debug->member1, "contact");
@@ -531 +531 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");
@@ -903 +903 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        osync_member_add_objtype(debug->member1, "contact");
@@ -916 +916 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");
@@ -1120 +1120 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        osync_member_add_objtype(debug->member1, "contact");
@@ -1133 +1133 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");
@@ -1382 +1382 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        
@@ -1393 +1393 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");
@@ -1575 +1575 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        
@@ -1586 +1586 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");
@@ -1771 +1771 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "file");
-        
@@ -1782 +1782 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "file");
-        osync_member_add_objtype(debug->member2, "contact");

trunk/tests/engine-tests/check_engine_error.c

@@ -403 +403 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "mockobjtype1");
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
@@ -416 +416 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "mockobjtype1");
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
@@ -486 +486 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "mockobjtype1");
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
@@ -499 +499 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "mockobjtype1");
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
@@ -569 +569 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "mockobjtype1");
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
@@ -581 +581 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "mockobjtype1");
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
@@ -650 +650 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "mockobjtype1");
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
@@ -663 +663 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>");
-        
@@ -731 +731 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member1, "mockobjtype1");
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
@@ -744 +744 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-
+//
-        osync_member_add_objtype(debug->member2, "mockobjtype1");
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");

trunk/wrapper/opensync-group.i

@@ -381 +381 @@
-        void set_objtype_enabled(const char *objtype, bool enabled) {
-                osync_member_set_objtype_enabled(self, objtype, enabled);
-        }
-
-        void set_start_type(StartType type) {
-                osync_member_set_start_type(self, type);
-        }
-
-        StartType get_start_type() {
-                return osync_member_get_start_type(self);
-        }
-