Changeset 859

Timestamp:

03/03/06 15:25:22 (3 years ago)

Author:

ehabkost

Message:

Revert revision 800: "Removed osync_plugin_accept_(objtype|format)"

The refactoring of the osync_plugin_accept_*() functions will be done
after the IPC code is working.

Location:

branches/ipc-branch/opensync

Files:

• opensync_member.c (modified) (1 diff)
• opensync_member.h (modified) (1 diff)
• opensync_member_internals.h (modified) (1 diff)
• opensync_plugin.c (modified) (1 diff)
• opensync_plugin.h (modified) (1 diff)

branches/ipc-branch/opensync/opensync_member.c

@@ -1493 +1493 @@
 }
 
-void osync_member_accept_objtype(OSyncMember *member, const char *objtypestr)
-{
-        OSyncObjTypeTemplate *template = osync_plugin_find_objtype_template(member->plugin, objtypestr);
-  OSyncObjTypeSink *sink = osync_objtype_sink_from_template(member->group, template);
-
-  member->objtype_sinks = g_list_append(member->objtype_sinks, sink);
-}
-
-void osync_member_accept_objformat(OSyncMember *member, const char *objtypestr, const char *formatstr, const char *extension)
-{
-        OSyncObjTypeTemplate *template = osync_plugin_find_objtype_template(member->plugin, objtypestr);
-        osync_assert(template, "Unable to accept objformat. Did you forget to add the objtype?");
-
-  OSyncObjFormatTemplate *format_template = osync_plugin_find_objformat_template(template, formatstr);
-        OSyncObjFormatSink *sink = osync_objformat_sink_from_template(member->group, format_template);
-
-  member->format_sinks = g_list_append(member->format_sinks, sink);
-}
-
-void osync_member_clear_accepted_types(OSyncMember *member)
-{
-  int i;
-
-  for (i = 0; i < g_list_length(member->objtype_sinks); ++i)
-    osync_objtypesink_free(g_list_nth_data(member->objtype_sinks, i));
-  g_list_free(member->objtype_sinks);
-
-  for (i = 0; i < g_list_length(member->format_sinks); ++i)
-    osync_objtypesink_free(g_list_nth_data(member->format_sinks, i));
-  g_list_free(member->format_sinks);
-}
-
-void osync_objtypesink_free(OSyncObjTypeSink *sink)
-{
-  g_list_free(sink->formatsinks);
-  g_list_free(sink->properties);
-}
-
-void osync_objformatsink_free(OSyncObjFormatSink *sink)
-{
-  g_free(sink->extension_name);
-  g_list_free(sink->commit_changes);
-  g_list_free(sink->commit_contexts);
-}
-
 /*@}*/

branches/ipc-branch/opensync/opensync_member.h

@@ -72 +72 @@
 void *osync_member_get_plugindata(OSyncMember *member);
 
-void osync_member_accept_objtype(OSyncMember *member, const char *objtypestr);
-void osync_member_accept_objformat(OSyncMember *member, const char *objtypestr, const char *formatstr, const char *extension);
-void osync_member_clear_accepted_types(OSyncMember *member);
-
 void *osync_member_get_loop(OSyncMember *member);
 void osync_member_set_loop(OSyncMember *member, void *loop);

branches/ipc-branch/opensync/opensync_member_internals.h

@@ -49 +49 @@
 OSyncObjFormatSink *osync_member_make_random_data(OSyncMember *member, OSyncChange *change, const char *objtypename);
 osync_bool osync_member_require_sink_info(OSyncMember *member, OSyncError **error);
-
-void osync_objtypesink_free(OSyncObjTypeSink *sink);
-void osync_objformatsink_free(OSyncObjFormatSink *sink);
-

branches/ipc-branch/opensync/opensync_plugin.c

@@ -557 +557 @@
 }
 
+/*! @brief Tells opensync that the plugin can accepts this object
+ * 
+ * Tells opensync that the plugin can accepts this object. Used by the plugin
+ * in the get_info() function
+ * 
+ * @param info The plugin info on which to operate
+ * @param objtypestr The name of the object which to accept
+ * 
+ */
+void osync_plugin_accept_objtype(OSyncPluginInfo *info, const char *objtypestr)
+{
+        OSyncObjTypeTemplate *template = g_malloc0(sizeof(OSyncObjTypeTemplate));
+        template->name = g_strdup(objtypestr);
+        info->plugin->accepted_objtypes = g_list_append(info->plugin->accepted_objtypes, template);
+}
+
+/*! @brief Tells opensync that the plugin can accepts this format for the given object
+ * 
+ * Tells opensync that the plugin can accepts this format. Used by the plugin
+ * in the get_info() function
+ * 
+ * @param info The plugin info on which to operate
+ * @param objtypestr The name of the objecttype
+ * @param formatstr The name of the format to accept
+ * @param extension The name of the extension that the plugin wants. NULL if none
+ * 
+ */
+void osync_plugin_accept_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, const char *extension)
+{
+        OSyncObjTypeTemplate *template = osync_plugin_find_objtype_template(info->plugin, objtypestr);
+        osync_assert(template, "Unable to accept objformat. Did you forget to add the objtype?");
+        OSyncObjFormatTemplate *format_template = g_malloc0(sizeof(OSyncObjFormatTemplate));
+        format_template->name = g_strdup(formatstr);
+        if (extension)
+                format_template->extension_name = g_strdup(extension);
+        template->formats = g_list_append(template->formats, format_template);
+}
+
 /*@}*/

branches/ipc-branch/opensync/opensync_plugin.h

@@ -132 +132 @@
 
 void *osync_plugin_get_function(OSyncPlugin *plugin, const char *name, OSyncError **error);
+void osync_plugin_accept_objtype(OSyncPluginInfo *info, const char *objtypestr);
+void osync_plugin_accept_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, const char *extension);
 void osync_plugin_set_commit_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, OSyncFormatCommitFn commit_change);
 void osync_plugin_set_access_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, OSyncFormatAccessFn access_fn);