[Opensync-commits] r6078 - in trunk: . opensync/group opensync/plugin

[<svn...@op...>]

Author: cdfrey
Date: Sat Aug 14 00:48:01 2010
New Revision: 6078
URL: http://www.opensync.org/changeset/6078

Log:
API: added osync_plugin_get_default_configdir() to access OPENSYNC_CONFIGDIR

Modified:
   trunk/opensync.sym
   trunk/opensync/group/opensync_member.c
   trunk/opensync/plugin/opensync_plugin_config.c
   trunk/opensync/plugin/opensync_plugin_config.h

Modified: trunk/opensync.sym
==============================================================================
--- trunk/opensync.sym	Sat Aug 14 00:47:52 2010	(r6077)
+++ trunk/opensync.sym	Sat Aug 14 00:48:01 2010	(r6078)
@@ -576,6 +576,7 @@
 osync_plugin_externalplugin_set_external_command
 osync_plugin_externalplugin_unref
 osync_plugin_finalize
+osync_plugin_get_default_configdir
 osync_plugin_get_config_type
 osync_plugin_get_data
 osync_plugin_get_description

Modified: trunk/opensync/group/opensync_member.c
==============================================================================
--- trunk/opensync/group/opensync_member.c	Sat Aug 14 00:47:52 2010	(r6077)
+++ trunk/opensync/group/opensync_member.c	Sat Aug 14 00:48:01 2010	(r6078)
@@ -277,10 +277,12 @@
 		osync_free(filename);
 #ifdef OPENSYNC_UNITTESTS
 		filename = osync_strdup_printf("%s"G_DIR_SEPARATOR_S"%s",
-				member->default_configdir ? member->default_configdir : OPENSYNC_CONFIGDIR,
+				member->default_configdir ? member->default_configdir : osync_plugin_get_default_configdir(),
 				member->pluginname);
 #else
-		filename = osync_strdup_printf(OPENSYNC_CONFIGDIR G_DIR_SEPARATOR_S"%s", member->pluginname);
+		filename = osync_strdup_printf("%s%s",
+			osync_plugin_get_default_configdir(),
+			member->pluginname);
 #endif		
 		osync_trace(TRACE_INTERNAL, "Reading default %s", filename);
 	}

Modified: trunk/opensync/plugin/opensync_plugin_config.c
==============================================================================
--- trunk/opensync/plugin/opensync_plugin_config.c	Sat Aug 14 00:47:52 2010	(r6077)
+++ trunk/opensync/plugin/opensync_plugin_config.c	Sat Aug 14 00:48:01 2010	(r6078)
@@ -1338,6 +1338,11 @@
 	return FALSE;
 }
 
+const char *osync_plugin_get_default_configdir(void)
+{
+	return OPENSYNC_CONFIGDIR G_DIR_SEPARATOR_S;
+}
+
 OSyncPluginConfig *osync_plugin_config_new(OSyncError **error)
 {
 	OSyncPluginConfig *config = osync_try_malloc0(sizeof(OSyncPluginConfig), error);

Modified: trunk/opensync/plugin/opensync_plugin_config.h
==============================================================================
--- trunk/opensync/plugin/opensync_plugin_config.h	Sat Aug 14 00:47:52 2010	(r6077)
+++ trunk/opensync/plugin/opensync_plugin_config.h	Sat Aug 14 00:48:01 2010	(r6078)
@@ -57,6 +57,20 @@
  **/
 typedef unsigned int OSyncPluginConfigSupportedFlags;
 
+/** @brief Returns the built-in default plugin configuration directory
+ *
+ * Returns a string containing the build-time directory where
+ * default plugin config files are stored, including trailing directory
+ * separator character.  (Usually "/usr/share/libopensync1/defaults/")
+ *
+ * Note that this is only really necessary if your plugin stores additional
+ * config files in the defaults directory that it needs to access later.
+ *
+ * @returns String with directory
+ *
+ */
+OSYNC_EXPORT const char *osync_plugin_get_default_configdir(void);
+
 /** @brief Create a new plugin config object
  *
  * @param error Pointer to and error struct