Merge lp:~rodrigo-moya/ubuntuone-client/high-level-libsd-api into lp:ubuntuone-client

[Rodrigo Moya]

Add high level API to SyncdaemonDaemon object

Add high level API to SyncdaemonDaemon object

[Alejandro J. Cura (alecu)]

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-config-interface.c'
--- libsyncdaemon/syncdaemon-config-interface.c	2010-10-04 20:29:05 +0000
+++ libsyncdaemon/syncdaemon-config-interface.c	2010-10-22 07:46:49 +0000
@@ -130,7 +130,7 @@
 }
 
 /**
- * syncdaemon_config_interface_set_bandwidth_throttling_enabled:
+ * syncdaemon_config_interface_set_bandwidth_throttling:
  */
 void
 syncdaemon_config_interface_set_bandwidth_throttling (SyncdaemonConfigInterface *interface, gboolean enabled)

=== modified file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2010-10-05 12:47:32 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	2010-10-22 07:46:49 +0000
@@ -662,6 +662,251 @@
 }
 
 /**
+ * syncdaemon_daemon_get_bandwidth_throttling:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Get whether bandwidth throttling is enabled or not.
+ *
+ * Return value: TRUE if enabled, FALSE if disabled.
+ */
+gboolean
+syncdaemon_daemon_get_bandwidth_throttling (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		return syncdaemon_config_interface_get_bandwidth_throttling (SYNCDAEMON_CONFIG_INTERFACE (interface));
+
+	return FALSE;
+}
+
+/**
+ * syncdaemon_daemon_set_bandwidth_throttling:
+ * @daemon: A #SyncdaemonDaemon object
+ * @enabled: Whether to enable bandwidth throttling or not.
+ *
+ * Enable or disable bandwidth throttling.
+ */
+void
+syncdaemon_daemon_set_bandwidth_throttling (SyncdaemonDaemon *daemon, gboolean enabled)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		syncdaemon_config_interface_set_bandwidth_throttling (SYNCDAEMON_CONFIG_INTERFACE (interface), enabled);
+}
+
+/**
+ * syncdaemon_daemon_get_files_sync:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Get whether file syncing is enabled or not.
+ *
+ * Return value: TRUE if enabled, FALSE if disabled.
+ */
+gboolean
+syncdaemon_daemon_get_files_sync (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		return syncdaemon_config_interface_get_files_sync (SYNCDAEMON_CONFIG_INTERFACE (interface));
+
+	return FALSE;
+}
+
+/**
+ * syncdaemon_daemon_set_files_sync:
+ * @daemon: A #SyncdaemonDaemon object
+ * @enabled: Whether to enable file syncing or not.
+ *
+ * Enable or disable file syncing.
+ */
+void
+syncdaemon_daemon_set_files_sync (SyncdaemonDaemon *daemon, gboolean enabled)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		syncdaemon_config_interface_set_files_sync (SYNCDAEMON_CONFIG_INTERFACE (interface), enabled);
+}
+
+/**
+ * syncdaemon_daemon_get_throttling_limits:
+ * @daemon: A #SyncdaemonDaemon object
+ * @download: Placeholder for download limits
+ * @upload: Placeholder for upload limits
+ *
+ * Retrieve download and upload throttling limits.
+ */
+void
+syncdaemon_daemon_get_throttling_limits (SyncdaemonDaemon *daemon, gint *download, gint *upload)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (interface != NULL) {
+		syncdaemon_config_interface_get_throttling_limits (SYNCDAEMON_CONFIG_INTERFACE (interface),
+								   download,
+								   upload);
+	}
+}
+
+/**
+ * syncdaemon_daemon_set_throttling_limits:
+ * @daemon: A #SyncdaemonDaemon object
+ * @download: Download limit
+ * @upload: Upload limit
+ *
+ * Set download and upload throttling limits.
+ */
+void
+syncdaemon_daemon_set_throttling_limits (SyncdaemonDaemon *daemon, gint download, gint upload)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (interface != NULL) {
+		syncdaemon_config_interface_set_throttling_limits (SYNCDAEMON_CONFIG_INTERFACE (interface),
+								   download,
+								   upload);
+	}
+}
+
+/**
+ * syncdaemon_daemon_get_udf_autosubscribe:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Get whether autosubscription for UDFs is enabled or not.
+ *
+ * Return value: TRUE if enabled, FALSE if disabled.
+ */
+gboolean
+syncdaemon_daemon_get_udf_autosubscribe (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		return syncdaemon_config_interface_get_udf_autosubscribe (SYNCDAEMON_CONFIG_INTERFACE (interface));
+
+	return FALSE;
+}
+
+/**
+ * syncdaemon_daemon_set_udf_autosubscribe:
+ * @daemon: A #SyncdaemonDaemon object
+ * @enabled: Whether to enable UDF autosubscription or not.
+ *
+ * Enable or disable UDF autosubscription.
+ */
+void
+syncdaemon_daemon_set_udf_autosubscribe (SyncdaemonDaemon *daemon, gboolean enabled)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_config_interface (daemon);
+	if (SYNCDAEMON_IS_CONFIG_INTERFACE (interface))
+		syncdaemon_config_interface_set_udf_autosubscribe (SYNCDAEMON_CONFIG_INTERFACE (interface), enabled);
+}
+
+/**
+ * syncdaemon_daemon_get_metadata:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Path to check metadata for
+ * @with_subtree_sync_check: For folders, whether to check the status of all its children
+ *
+ * Retrieve metadata for a file or folder inside a Ubuntu One directory.
+ *
+ * Return value: Metadata for the specified path.
+ */
+SyncdaemonMetadata *
+syncdaemon_daemon_get_metadata (SyncdaemonDaemon *daemon, const gchar *path, gboolean with_subtree_sync_check)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_filesystem_interface (daemon);
+	if (interface != NULL) {
+		return syncdaemon_filesystem_interface_get_metadata (SYNCDAEMON_FILESYSTEM_INTERFACE (interface),
+								     path,
+								     with_subtree_sync_check);
+	}
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_folders:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Retrieve the list of folders setup for synchronization with Ubuntu One.
+ *
+ * Return value: A list of #SyncdaemonFolderInfo containing all the folders being
+ * synchronized by the user. When no longer needed, the list should be freed
+ * by calling g_slist_free.
+ */
+GSList *
+syncdaemon_daemon_get_folders (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_folder_info:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Full path of the folder for which to retrieve information.
+ *
+ * Get information about a folder under Ubuntu One.
+ *
+ * Return value: A #SyncdaemonFolderInfo object containing all the information
+ * for the node. When no longer needed, it should be freed by calling
+ * g_object_unref.
+ */
+SyncdaemonFolderInfo *
+syncdaemon_daemon_get_folder_info (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_folders_interface_get_info (SYNCDAEMON_FOLDERS_INTERFACE (interface), path);
+
+	return NULL;
+}
+
+/**
  * syncdaemon_daemon_is_folder_enabled:
  * @daemon: A #SyncdaemonDaemon object
  * @path: The folder path to check
@@ -726,6 +971,281 @@
 	return managed;
 }
 
+/**
+ * syncdaemon_daemon_create_folder:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: The full path of the folder to create
+ *
+ * Enable a folder for Ubuntu One synchronization.
+ *
+ * The result of the operation can be retrieved by connecting to the "folder_created"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_create_folder (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		syncdaemon_folders_interface_create (SYNCDAEMON_FOLDERS_INTERFACE (interface), path);
+	else
+		g_signal_emit (daemon, daemon_signals[FOLDER_CREATED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_delete_folder:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: The full path of the folder to delete
+ *
+ * Disable a folder for Ubuntu One synchronization.
+ *
+ * The result of the operation can be retrieved by connecting to the "folder_deleted"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_delete_folder (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		syncdaemon_folders_interface_delete (SYNCDAEMON_FOLDERS_INTERFACE (interface), path);
+	else
+		g_signal_emit (daemon, daemon_signals[FOLDER_DELETED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_subscribe_folder:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: The full path of the folder to subscribe
+ *
+ * Subscribe a folder for Ubuntu One synchronization.
+ *
+ * The result of the operation can be retrieved by connecting to the "folder_subscribed"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_subscribe_folder (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		syncdaemon_folders_interface_subscribe (SYNCDAEMON_FOLDERS_INTERFACE (interface), path);
+	else
+		g_signal_emit (daemon, daemon_signals[FOLDER_SUBSCRIBED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_unsubscribe_folder:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: The full path of the folder to unsubscribe
+ *
+ * Unsubscribe a folder from Ubuntu One synchronization.
+ *
+ * The result of the operation can be retrieved by connecting to the "folder_unsubscribed"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_unsubscribe_folder (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_folders_interface (daemon);
+	if (interface != NULL)
+		syncdaemon_folders_interface_unsubscribe (SYNCDAEMON_FOLDERS_INTERFACE (interface), path);
+	else
+		g_signal_emit (daemon, daemon_signals[FOLDER_UNSUBSCRIBED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_create_share:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Full path of the folder to be shared
+ * @usernames: List of users with whom to share the folder
+ * @name: Name to be used for the share
+ * @allow_modifications: Whether to allow modifications to the list of users
+ *
+ * Share a Ubuntu One folder with a list of users.
+ *
+ * The result of the operation can be retrieved by connecting to the "share_created"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_create_share (SyncdaemonDaemon *daemon,
+				const gchar *path,
+				GSList *usernames,
+				const gchar *name,
+				gboolean allow_modifications)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_shares_interface (daemon);
+	if (interface != NULL) {
+		syncdaemon_shares_interface_create (SYNCDAEMON_SHARES_INTERFACE (interface),
+						    path,
+						    usernames,
+						    name,
+						    allow_modifications);
+	} else
+		g_signal_emit (daemon, daemon_signals[SHARE_CREATED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_delete_share:
+ * @daemon: A #SyncdaemonDaemon object
+ * @path: Full path of the folder to be shared
+ *
+ * Stop sharing a Ubuntu One folder.
+ *
+ * The result of the operation can be retrieved by connecting to the "share_deleted"
+ * signal of the #SyncdaemonDaemon object.
+ */
+void
+syncdaemon_daemon_delete_share (SyncdaemonDaemon *daemon, const gchar *path)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_if_fail (SYNCDAEMON_IS_DAEMON (daemon));
+
+	interface = syncdaemon_daemon_get_shares_interface (daemon);
+	if (interface != NULL)
+		syncdaemon_shares_interface_delete (SYNCDAEMON_SHARES_INTERFACE (interface), path);
+	else
+		g_signal_emit (daemon, daemon_signals[SHARE_DELETED_SIGNAL], 0, FALSE, NULL);
+}
+
+/**
+ * syncdaemon_daemon_get_shared_folders:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Get the list of folders shared by the user with other users.
+ *
+ * Return value: A GSList of #SyncdaemonShareInfo objects. When no longer needed,
+ * the list should be freed by calling #g_slist_free.
+ */
+GSList *
+syncdaemon_daemon_get_shared_folders (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_shares_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_shares_interface_get_shared (SYNCDAEMON_SHARES_INTERFACE (interface));
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_shares:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Get the list of folders shared by other users with the current user.
+ *
+ * Return value: A GSList of #SyncdaemonShareInfo objects. When no longer needed,
+ * the list should be freed by calling #g_slist_free.
+ */
+GSList *
+syncdaemon_daemon_get_shares (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_shares_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_shares_interface_get_shares (SYNCDAEMON_SHARES_INTERFACE (interface));
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_current_status:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Retrieve the current status of SyncDaemon.
+ *
+ * Return value: A #SyncdaemonStatusInfo object containing information about
+ * Syncdaemon's current status. When no longer needed, it should be freed by
+ * calling g_object_unref.
+ */
+SyncdaemonStatusInfo *
+syncdaemon_daemon_get_current_status (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_status_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_status_interface_get_current_status (SYNCDAEMON_STATUS_INTERFACE (interface));
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_current_downloads:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Retrieve the list of downloads in progress.
+ *
+ * Return value: A GSList of #SyncdaemonTransferInfo objects, each of which contains
+ * information about a file download in progress. The data in the list belongs to
+ * the library, so when no longer needed, the list should be freed by just calling
+ * g_slist_free.
+ */
+GSList *
+syncdaemon_daemon_get_current_downloads (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_status_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_status_interface_get_current_downloads (SYNCDAEMON_STATUS_INTERFACE (interface));
+
+	return NULL;
+}
+
+/**
+ * syncdaemon_daemon_get_current_uploads:
+ * @daemon: A #SyncdaemonDaemon object
+ *
+ * Retrieve the list of uploads in progress.
+ *
+ * Return value: A GSList of #SyncdaemonTransferInfo objects, each of which contains
+ * information about a file upload in progress. The data in the list belongs to
+ * the library, so when no longer needed, the list should be freed by just calling
+ * g_slist_free.
+ */
+GSList *
+syncdaemon_daemon_get_current_uploads (SyncdaemonDaemon *daemon)
+{
+	SyncdaemonInterface *interface;
+
+	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
+
+	interface = syncdaemon_daemon_get_status_interface (daemon);
+	if (interface != NULL)
+		return syncdaemon_status_interface_get_current_uploads (SYNCDAEMON_STATUS_INTERFACE (interface));
+
+	return NULL;
+}
+
 typedef SyncdaemonInterface * (* SDINewFunc) (SyncdaemonDaemon * daemon);
 
 static SyncdaemonInterface *

=== modified file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2010-09-29 11:12:35 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	2010-10-22 07:46:49 +0000
@@ -27,6 +27,7 @@
 #include "syncdaemon-file-info.h"
 #include "syncdaemon-folder-info.h"
 #include "syncdaemon-interface.h"
+#include "syncdaemon-metadata.h"
 #include "syncdaemon-share-info.h"
 #include "syncdaemon-status-info.h"
 #include "syncdaemon-transfer-info.h"
@@ -95,10 +96,50 @@
 gboolean             syncdaemon_daemon_has_network (SyncdaemonDaemon *daemon);
 SyncdaemonAuthentication *syncdaemon_daemon_get_authentication (SyncdaemonDaemon *daemon);
 
+/* Configuration */
+gboolean             syncdaemon_daemon_get_bandwidth_throttling (SyncdaemonDaemon *daemon);
+void                 syncdaemon_daemon_set_bandwidth_throttling (SyncdaemonDaemon *daemon, gboolean enabled);
+gboolean             syncdaemon_daemon_get_files_sync (SyncdaemonDaemon *daemon);
+void                 syncdaemon_daemon_set_files_sync (SyncdaemonDaemon *daemon, gboolean enabled);
+void                 syncdaemon_daemon_get_throttling_limits (SyncdaemonDaemon *daemon, gint *download, gint *upload);
+void                 syncdaemon_daemon_set_throttling_limits (SyncdaemonDaemon *daemon, gint download, gint upload);
+gboolean             syncdaemon_daemon_get_udf_autosubscribe (SyncdaemonDaemon *daemon);
+void                 syncdaemon_daemon_set_udf_autosubscribe (SyncdaemonDaemon *daemon, gboolean enabled);
+
+/* File system operations */
+SyncdaemonMetadata  *syncdaemon_daemon_get_metadata (SyncdaemonDaemon *daemon,
+						     const gchar *path,
+						     gboolean with_subtree_sync_check);
+
+
 /* Folders operations */
+GSList              *syncdaemon_daemon_get_folders (SyncdaemonDaemon *daemon);
+SyncdaemonFolderInfo*syncdaemon_daemon_get_folder_info (SyncdaemonDaemon *daemon, const gchar *path);
 gboolean             syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon,
 							  const gchar *path,
 							  gboolean *is_root);
+void                 syncdaemon_daemon_create_folder (SyncdaemonDaemon *daemon, const gchar *path);
+void                 syncdaemon_daemon_delete_folder (SyncdaemonDaemon *daemon, const gchar *path);
+void                 syncdaemon_daemon_subscribe_folder (SyncdaemonDaemon *daemon, const gchar *path);
+void                 syncdaemon_daemon_unsubscribe_folder (SyncdaemonDaemon *daemon, const gchar *path);
+
+/* Public files operations */
+/* FIXME: need nautilus-refactor branch landed first */
+
+/* Shares operations */
+void                 syncdaemon_daemon_create_share (SyncdaemonDaemon *daemon,
+						     const gchar *path,
+						     GSList *usernames,
+						     const gchar *name,
+						     gboolean allow_modifications);
+void                 syncdaemon_daemon_delete_share (SyncdaemonDaemon *daemon, const gchar *path);
+GSList              *syncdaemon_daemon_get_shared_folders (SyncdaemonDaemon *daemon);
+GSList              *syncdaemon_daemon_get_shares (SyncdaemonDaemon *daemon);
+
+/* Status operations */
+SyncdaemonStatusInfo*syncdaemon_daemon_get_current_status (SyncdaemonDaemon *daemon);
+GSList              *syncdaemon_daemon_get_current_downloads (SyncdaemonDaemon *daemon);
+GSList              *syncdaemon_daemon_get_current_uploads (SyncdaemonDaemon *daemon);
 
 /*
  * Low level DBus interface access

=== modified file 'libsyncdaemon/test-libsyncdaemon.c'
--- libsyncdaemon/test-libsyncdaemon.c	2010-10-04 18:47:52 +0000
+++ libsyncdaemon/test-libsyncdaemon.c	2010-10-22 07:46:49 +0000
@@ -58,33 +58,29 @@
 static void
 test_config (void)
 {
-	SyncdaemonConfigInterface *config;
 	gboolean orig_enabled, enabled;
 
-	config = (SyncdaemonConfigInterface *) syncdaemon_daemon_get_config_interface (the_daemon);
-	g_assert (SYNCDAEMON_IS_CONFIG_INTERFACE (config));
-
 	/* Test set/get_throttling_enabled */
-	orig_enabled = syncdaemon_config_interface_get_bandwidth_throttling (config);
-	syncdaemon_config_interface_set_bandwidth_throttling (config, !orig_enabled);
-	enabled = syncdaemon_config_interface_get_bandwidth_throttling (config);
+	orig_enabled = syncdaemon_daemon_get_bandwidth_throttling (the_daemon);
+	syncdaemon_daemon_set_bandwidth_throttling (the_daemon, !orig_enabled);
+	enabled = syncdaemon_daemon_get_bandwidth_throttling (the_daemon);
 	g_assert (orig_enabled != enabled);
 
-	syncdaemon_config_interface_set_bandwidth_throttling (config, orig_enabled);
-	enabled = syncdaemon_config_interface_get_bandwidth_throttling (config);
+	syncdaemon_daemon_set_bandwidth_throttling (the_daemon, orig_enabled);
+	enabled = syncdaemon_daemon_get_bandwidth_throttling (the_daemon);
 	g_assert (orig_enabled == enabled);
 
 	/* FIXME: we don't test get/set_files_sync since disabling it means the
 	   syncdaemon quits and doesn't start anymore */
 
 	/* Test set/get_udf_autosubscribe */
-	orig_enabled = syncdaemon_config_interface_get_udf_autosubscribe (config);
-	syncdaemon_config_interface_set_udf_autosubscribe (config, !orig_enabled);
-	enabled = syncdaemon_config_interface_get_udf_autosubscribe (config);
+	orig_enabled = syncdaemon_daemon_get_udf_autosubscribe (the_daemon);
+	syncdaemon_daemon_set_udf_autosubscribe (the_daemon, !orig_enabled);
+	enabled = syncdaemon_daemon_get_udf_autosubscribe (the_daemon);
 	g_assert (orig_enabled != enabled);
 
-	syncdaemon_config_interface_set_udf_autosubscribe (config, orig_enabled);
-	enabled = syncdaemon_config_interface_get_udf_autosubscribe (config);
+	syncdaemon_daemon_set_udf_autosubscribe (the_daemon, orig_enabled);
+	enabled = syncdaemon_daemon_get_udf_autosubscribe (the_daemon);
 	g_assert (orig_enabled == enabled);
 }
 
@@ -192,13 +188,9 @@
 test_folders (void)
 {
 	GSList *folders_list, *l;
-	SyncdaemonFoldersInterface *folders;
-
-	folders = (SyncdaemonFoldersInterface *) syncdaemon_daemon_get_folders_interface (the_daemon);
-	g_assert (SYNCDAEMON_IS_FOLDERS_INTERFACE (folders));
 
 	/* Get list of UDFs */
-	folders_list = syncdaemon_folders_interface_get_folders (folders);
+	folders_list = syncdaemon_daemon_get_folders (the_daemon);
 	g_assert (g_slist_length (folders_list) >= 1);
 	
 	for (l = folders_list; l != NULL; l = l->next) {
@@ -335,13 +327,9 @@
 test_shares (void)
 {
 	GSList *list;
-	SyncdaemonSharesInterface *shares;
-
-	shares = (SyncdaemonSharesInterface *) syncdaemon_daemon_get_shares_interface (the_daemon);
-	g_assert (SYNCDAEMON_IS_SHARES_INTERFACE (shares));
 
 	/* Get shared folders */
-	list = syncdaemon_shares_interface_get_shared (shares);
+	list = syncdaemon_daemon_get_shared_folders (the_daemon);
 	while (list != NULL) {
 		SyncdaemonShareInfo *share_info = list->data;
 
@@ -352,7 +340,7 @@
 	}
 
 	/* Get shares */
-	list = syncdaemon_shares_interface_get_shares (shares);
+	list = syncdaemon_daemon_get_shares (the_daemon);
 	while (list != NULL) {
 		SyncdaemonShareInfo *share_info = list->data;
 
@@ -367,13 +355,9 @@
 test_status (void)
 {
 	GSList *list;
-	SyncdaemonStatusInterface *status;
-
-	status = (SyncdaemonStatusInterface *) syncdaemon_daemon_get_status_interface (the_daemon);
-	g_assert (SYNCDAEMON_IS_STATUS_INTERFACE (status));
 
 	/* Test getting current downloads */
-	list = syncdaemon_status_interface_get_current_downloads (status);
+	list = syncdaemon_daemon_get_current_downloads (the_daemon);
 	while (list != NULL) {
 		SyncdaemonTransferInfo *tinfo = (SyncdaemonTransferInfo *) list->data;
 
@@ -382,7 +366,7 @@
 	}
 
 	/* Test getting current uploads */
-	list = syncdaemon_status_interface_get_current_uploads (status);
+	list = syncdaemon_daemon_get_current_uploads (the_daemon);
 	while (list != NULL) {
 		SyncdaemonTransferInfo *tinfo = (SyncdaemonTransferInfo *) list->data;