Changeset 425

Timestamp:

03/31/05 15:14:12 (4 years ago)

Author:

abauer

Message:

Added a has_configuration option to the plugin info that
can be used to tell opensync that this plugin does not have any
configuration options.

Location:

trunk/opensync

Files:

• opensync_changecmds.c (modified) (2 diffs)
• opensync_changecmds.h (modified) (1 diff)
• opensync_convert.c (modified) (1 diff)
• opensync_format_internals.h (modified) (1 diff)
• opensync_member.c (modified) (1 diff)
• opensync_member.h (modified) (1 diff)
• opensync_plugin.c (modified) (1 diff)
• opensync_plugin.h (modified) (1 diff)

trunk/opensync/opensync_changecmds.c

@@ -59 +59 @@
         const char *name = data;
         return !strcmp(name, fmt->name);
+}
+
+/** Function used on path searchs for a sink on a member
+ *
+ * @see osync_conv_find_path_fn(), osync_change_convert_member_sink()
+ */
+static osync_bool target_fn_membersink(const void *data, OSyncObjFormat *fmt)
+{
+        const OSyncMember *memb = data;
+        GList *i;
+        for (i = memb->format_sinks; i; i = i->next) {
+                OSyncObjFormatSink *sink = i->data;
+                if (sink->format == fmt)
+                        return TRUE;
+        }
+
+        /* Not found */
+        return FALSE;
 }
 
@@ -437 +455 @@
 }
 
+/*! @brief Convert a change to the nearest sink on a member
+ * 
+ * 
+ * @param env The conversion environment to use
+ * @param change The change to convert
+ * @param member The member that will receive the change
+ * @param error The error-return location
+ * @returns TRUE on success, FALSE otherwise
+ * 
+ */
+osync_bool osync_change_convert_member_sink(OSyncFormatEnv *env, OSyncChange *change, OSyncMember *member, OSyncError **error)
+{
+        return osync_conv_convert_fn(env, change, target_fn_membersink, member, member->extension, error);
+}
+
 /*! @brief Tries to detect the object type of the given change
  * 

trunk/opensync/opensync_changecmds.h

@@ -17 +17 @@
 osync_bool osync_change_convert_to_common(OSyncChange *change, OSyncError **error);
 osync_bool osync_change_convert_extension(OSyncFormatEnv *env, OSyncChange *change, OSyncObjFormat *targetformat, const char *extension_name, OSyncError **error);
+osync_bool osync_change_convert_member_sink(OSyncFormatEnv *env, OSyncChange *change, OSyncMember *memb, OSyncError **error);
 
 osync_bool osync_change_copy_data(OSyncChange *source, OSyncChange *target, OSyncError **error);

trunk/opensync/opensync_convert.c

@@ -515 +515 @@
 }
 
-/** Function used on path searchs for a sink on a member
- *
- * @see osync_conv_find_path_fn(), osync_change_convert_member_sink()
- */
-static osync_bool target_fn_membersink(const void *data, OSyncObjFormat *fmt)
-{
-        const OSyncMember *memb = data;
-        GList *i;
-        for (i = memb->format_sinks; i; i = i->next) {
-                OSyncObjFormatSink *sink = i->data;
-                if (sink->format == fmt)
-                        return TRUE;
-        }
-
-        /* Not found */
-        return FALSE;
-}
-
-/** Convert a change to the nearest format sink on a member
- */
-osync_bool osync_change_convert_member_sink(OSyncFormatEnv *env, OSyncChange *change, OSyncMember *member, OSyncError **error)
-{
-        return osync_conv_convert_fn(env, change, target_fn_membersink, member, member->extension, error);
-}
-
 osync_bool osync_conv_objtype_is_any(const char *objstr)
 {

trunk/opensync/opensync_format_internals.h

@@ -161 +161 @@
 osync_bool osync_conv_convert_fn(OSyncFormatEnv *env, OSyncChange *change, OSyncPathTargetFn target_fn, const void *fndata, const char *extension_name, OSyncError **error);
 osync_bool osync_conv_convert_fmtlist(OSyncFormatEnv *env, OSyncChange *change, GList/*OSyncObjFormat * */ *targets);
-osync_bool osync_change_convert_member_sink(OSyncFormatEnv *env, OSyncChange *change, OSyncMember *memb, OSyncError **error);
 OSyncDataDetector *osync_env_find_detector(OSyncEnv *env, const char *sourcename, const char *targetname);
 osync_bool osync_conv_objtype_is_any(const char *objstr);

trunk/opensync/opensync_member.c

@@ -375 +375 @@
         member->configsize = size;
         osync_trace(TRACE_EXIT, "%s", __func__);
+}
+
+/** @brief Returns if the member has configuation options
+ * 
+ * @param member The member
+ * @return TRUE if member needs to be configured, FALSE otherwise
+ * 
+ */
+osync_bool osync_member_has_configuration(OSyncMember *member)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, member);
+        g_assert(member);       
+        osync_trace(TRACE_EXIT, "%s: %i", __func__, member->plugin->info.has_configuration);
+        return member->plugin->info.has_configuration;
 }
 

trunk/opensync/opensync_member.h

@@ -23 +23 @@
 osync_bool osync_member_get_config(OSyncMember *member, char **data, int *size, OSyncError **error);
 void osync_member_set_config(OSyncMember *member, const char *data, int size);
+osync_bool osync_member_has_configuration(OSyncMember *member);
 const char *osync_member_get_pluginname(OSyncMember *member);
 osync_bool osync_member_initialize(OSyncMember *member, OSyncError **error);

trunk/opensync/opensync_plugin.c

@@ -135 +135 @@
         
         plugin->info.plugin = plugin;
+        plugin->info.has_configuration = TRUE;
         
         if (env) {

trunk/opensync/opensync_plugin.h

@@ -85 +85 @@
         /** The timeouts of your plugin */
         OSyncPluginTimeouts timeouts;
+        /** Does the plugin have configuration options? */
+        osync_bool has_configuration;
         /** The pointer to the plugin (for internal use) */
         OSyncPlugin *plugin;