Merge lp:~dobey/ubuntuone-client/update-13-10 into lp:ubuntuone-client/stable-13-10

[dobey]

[Rodney Dawes]

    Drop libsyncdaemon from tree and convert to pure Python project.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client/update-13-10 into lp:ubuntuone-client/stable-13-10 failed. Below is the output from the failed tests.

*** Running test suite for tests ***
running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/contrib
creating build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/testcase.py -> build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/__init__.py -> build/lib.linux-x86_64-2.7/contrib/testing
creating build/lib.linux-x86_64-2.7/ubuntuone
creating build/lib.linux-x86_64-2.7/ubuntuone/platform
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/ipc_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/dbus_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
creating build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_client.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_server.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
creating build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/notification.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/aggregator.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/windows.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/__init__.py -...

=== modified file '.bzrignore'
--- .bzrignore	2011-02-09 19:54:46 +0000
+++ .bzrignore	2013-07-10 19:40:32 +0000
@@ -1,86 +1,15 @@
-Makefile
-Makefile.in
-Makefile.in.in
 POTFILES
-.deps
-.libs
-autom4te.cache
 build
 dist
-m4
-tmp
 _trial_temp
-aclocal.m4
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-intltool-*
-libtool
-ltmain.sh
-missing
-setup.py
-stamp-*
+*.egg-info
+
 *.desktop
 *.gmo
-*.icon
-*.la
-*.lo
-*.menu
 *_pb2.py
 *.pot
 *.pyc
-*.rendercache
 *.service
-.intltool-merge-cache
-gtk-doc.make
 
-ubuntuone-client-*.tar.*
-hicolor
-icons
-storageprotocol
 clientdefs.py
-docs/syncdaemon_dbus_api.txt
-docs/reference/html*
-docs/reference/libsyncdaemon-decl-list.txt
-docs/reference/libsyncdaemon-decl-list.txt.bak
-docs/reference/libsyncdaemon-decl.txt
-docs/reference/libsyncdaemon-decl.txt.bak
-docs/reference/libsyncdaemon-overrides.txt
-docs/reference/libsyncdaemon-sections.txt
-docs/reference/libsyncdaemon-undeclared.txt
-docs/reference/libsyncdaemon-undocumented.txt
-docs/reference/libsyncdaemon-unused.txt
-docs/reference/libsyncdaemon.args
-docs/reference/libsyncdaemon.hierarchy
-docs/reference/libsyncdaemon.interfaces
-docs/reference/libsyncdaemon.prerequisites
-docs/reference/libsyncdaemon.signals
-docs/reference/libsyncdaemon.types
-docs/reference/*.stamp
-docs/reference/tmpl
-docs/reference/xml*
 logging.conf
-ubuntuone-marshallers.[ch]
-
-nautilus/test-contacts-picker
-nautilus/test-highlight
-
-libsyncdaemon/syncdaemon-marshal.[ch]
-libsyncdaemon/test-libsyncdaemon
-libsyncdaemon/test-libsyncdaemon-vapi
-libsyncdaemon/test-libsyncdaemon-vapi.c
-libsyncdaemon/libsyncdaemon-1.0.pc
-libsyncdaemon/Syncdaemon-1.0.gir
-libsyncdaemon/Syncdaemon-1.0.typelib
-libsyncdaemon/libsyncdaemon-1.0.deps
-libsyncdaemon/libsyncdaemon-1.0.vapi
-*_vala.stamp
-
-ubuntuone.gnome-settings-plugin
-test-gsd-ubuntuone

=== removed file 'Makefile.am'
--- Makefile.am	2013-05-29 13:45:19 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-SUBDIRS = data libsyncdaemon po docs
-
-# Shut libtoolize up
-ACLOCAL_AMFLAGS = -I m4
-
-# PYTHONPATH for local Python scripts
-PYTHONPATH="$(SSO_PATH):$(USP_PATH):$(top_builddir):$(top_srcdir)"
-
-# Python packages we want to install
-pythonpkgdir = $(pythondir)/$(PACKAGE)
-pypackages =	\
-	ubuntuone	\
-	$(shell SRCDIR="ubuntuone"; for i in `find $$SRCDIR -type d`; do DIRNAME=`basename $$i`; if [ "x$$DIRNAME" != "xtest" ]; then printf "$$i "; fi; done)
-
-# Install our scripts and extra data here
-bin_SCRIPTS =				\
-	bin/ubuntuone-launch		\
-	bin/u1sdtool
-
-libexec_SCRIPTS =			\
-	bin/ubuntuone-syncdaemon	\
-	bin/ubuntuone-proxy-tunnel      \
-	bin/ubuntuone-login
-
-clientdefsdir = $(pythonpkgdir)/ubuntuone
-clientdefs_in_files = ubuntuone/clientdefs.py.in
-clientdefs_DATA = $(clientdefs_in_files:.py.in=.py)
-
-# Don't end up pulling in storage-protocol source as well
-pyfiles = $(shell SRCDIR="$(top_srcdir)/ubuntuone"; for i in `find $$SRCDIR -type f -name "*.py"`; do if [ ! -f $$i.in ]; then printf "$$i "; fi; done)
-
-$(clientdefs_DATA): $(clientdefs_in_files) ubuntuone
-	sed -e 's|\@localedir\@|$(localedir)|g' \
-	-e 's|\@libexecdir\@|$(libexecdir)|g' \
-	-e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g' \
-	-e 's|\@SSO_APP_NAME\@|$(SSO_APP_NAME)|g' \
-	-e 's|\@SSO_TC_URL\@|$(SSO_TC_URL)|g' \
-	-e 's|\@SSO_PING_URL\@|$(SSO_PING_URL)|g' \
-	-e 's|\@VERSION\@|$(VERSION)|g' < $< > $@
-
-logging.conf: data/logging.conf.in Makefile
-	$(MAKE) -C data logging.conf
-
-lint: $(clientdefs_DATA) Makefile
-	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" u1lint -i ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py
-
-test: logging.conf $(clientdefs_DATA) Makefile
-	echo "$(PYTHONPATH)"
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i "test_windows.py,test_darwin.py,test_fsevents_daemon.py" tests || exit 1; \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
-		PYTHONPATH="$(PYTHONPATH)" $(PYTHON) tests/platform/check_reactor_import.py || exit 1; \
-	fi
-	rm -rf _trial_temp
-
-test-proxy: logging.conf $(clientdefs_DATA) Makefile
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
-	fi
-	rm -rf _trial_temp
-
-test-coverage: logging.conf $(clientdefs_DATA) Makefile
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests; \
-	fi
-	rm -rf _trial_temp
-
-check: lint test Makefile
-
-docs: $(clientdefs_DATA) Makefile
-	$(mkdir_p) docs
-	if test "x$(builddir)" != "x$(srcdir)" -a -f "$(srcdir)/docs/syncdaemon_dbus_api.txt"; then \
-		$(LN_S) "$(top_srcdir)/docs/syncdaemon_dbus_api.txt" "docs/syncdaemon_dbus_api.txt"; \
-	else \
-		PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/contrib/dbus-docs; \
-	fi
-
-ubuntuone: Makefile
-	if test "x$(builddir)" != "x$(srcdir)"; then \
-		$(mkdir_p) ubuntuone; \
-		$(mkdir_p) tests; \
-		(cd ubuntuone && $(LNDIR) $(srcdir)/../ubuntuone > /dev/null); \
-		(cd tests && $(LNDIR) $(srcdir)/../tests > /dev/null); \
-	fi
-
-all-local: logging.conf $(clientdefs_DATA)
-
-sd_path = ubuntuone/syncdaemon
-
-u1fsfsm: $(srcdir)/ubuntuone/syncdaemon/u1fsfsm.ods
-	PYTHONPATH=$(PYTHONPATH) \
-	HAS_OOFFICE="true" \
-	XDG_CACHE_HOME="$(builddir)/_trial_temp/xdg_cache" \
-	$(PYTHON) -t $(srcdir)/$(sd_path)/fsm/fsm_parser.py \
-		-o $(builddir)/$(sd_path)/u1fsfsm.py $<
-	PYTHONPATH=$(PYTHONPATH) \
-	HAS_OOFFICE="true" \
-	XDG_CACHE_HOME="$(builddir)/_trial_temp/xdg_cache" \
-	$(PYTHON) -t $(srcdir)/$(sd_path)/fsm/fsm.py \
-		$(srcdir)/$(sd_path)/u1fsfsm.py
-
-install-data-local: $(clientdefs_DATA)
-	for package in $(pypackages); do \
-		$(mkdir_p) $(DESTDIR)$(pythonpkgdir)/$$package; \
-		for module in $(top_srcdir)/$$package/*.py; do \
-			$(install_sh_DATA) $$module $(DESTDIR)$(pythonpkgdir)/$$package; \
-		done; \
-	done
-	echo "$(PACKAGE)" > $(DESTDIR)$(pythondir)/$(PACKAGE).pth
-
-uninstall-local:
-	for package in $(pypackages); do \
-		for module in $(top_srcdir)/$$package/*.py; do \
-			modname=`basename $$module`; \
-			rm -f $(DESTDIR)$(pythonpkgdir)/$$package/$$modname; \
-		done; \
-		rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(pythonpkgdir)/$$package; \
-	done
-	rm -f $(DESTDIR)$(pythondir)/$(PACKAGE).pth
-
-clean-local:
-	for i in `find $(builddir) -name "*.pyc"`; do \
-		rm -f $$i; \
-	done
-	rm -rf build dist _trial_temp
-
-EXTRA_DIST =		\
-	$(srcdir)/ubuntuone/syncdaemon/u1fsfsm.ods	\
-	$(pyfiles)	\
-	$(clientdefs_in_files) \
-	LICENSE		\
-	LICENSE.OpenSSL	\
-	HACKING		\
-	VERSION	\
-	bin		\
-	contrib		\
-	tests
-
-CLEANFILES =	\
-	$(clientdefs_DATA)
-
-MAINTAINERCLEANFILES =	\
-	Makefile.in	\
-	aclocal.m4	\
-	config.guess	\
-	config.h.in	\
-	config.sub	\
-	configure	\
-	depcomp		\
-	install-sh	\
-	libtool		\
-	ltmain.sh	\
-	missing		\
-	mkinstalldirs

=== removed file 'VERSION'
--- VERSION	2013-05-30 18:46:21 +0000
+++ VERSION	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-13.05

=== removed file 'autogen.sh'
--- autogen.sh	2012-01-03 12:52:20 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="ubuntuone-client"
-REQUIRED_AUTOMAKE_VERSION="1.10"
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-	echo "You need to install gnome-common from the GNOME source repository"
-	exit 1
-}
-
-USE_GNOME2_MACROS=1 . gnome-autogen.sh

=== removed file 'configure.ac'
--- configure.ac	2013-02-21 20:59:11 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.53)
-
-# We need to omit the trailing newline when catting the VERSION file
-AC_INIT([ubuntuone-client], m4_esyscmd([cat VERSION | tr -d '\012']))
-AC_CONFIG_SRCDIR([config.h.in])
-
-AM_INIT_AUTOMAKE([1.10 foreign tar-ustar])
-AM_CONFIG_HEADER([config.h])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_LIBTOOL
-PKG_PROG_PKG_CONFIG([0.19])
-IT_PROG_INTLTOOL([0.40.0])
-
-GETTEXT_PACKAGE="${PACKAGE}"
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-	[translation domain of this package])
-AC_SUBST(GETTEXT_PACKAGE)
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
-# Workaround to make aclocal get the right flags
-AC_CONFIG_MACRO_DIR([m4])
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS} -I m4")
-
-# Need lndir for builddir != srcdir builds, because Python is not sane
-AC_PATH_PROG([LNDIR], [lndir], [])
-if test "x$LNDIR" = "x"; then
-   AC_MSG_ERROR([lndir is required to build ubuntuone-client])
-fi
-
-# Alter default logging if we're development vs. stable
-AC_MSG_CHECKING([development series build])
-DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
-if expr $DEVVERSION % 2 > /dev/null != "0"; then
-   debugging=yes
-   AC_MSG_RESULT([yes])
-else
-   debugging=no
-   AC_MSG_RESULT([no])
-fi
-
-AC_ARG_ENABLE([debug],
-   AC_HELP_STRING([--enable-debug],
-       [Enable debug logging by default [default=auto]]),
-   enable_debug=$enableval,
-   enable_debug=$debugging)
-if test "x$enable_debug" != "xno"; then
-   LOG_LEVEL="DEBUG"
-   LOG_FILE_SIZE="10485760"
-   CFLAGS="${CFLAGS} -Wall -Werror"
-   AC_SUBST(CFLAGS)
-else
-   LOG_LEVEL="INFO"
-   LOG_FILE_SIZE="1048576"
-fi
-AC_SUBST(LOG_LEVEL)
-AC_SUBST(LOG_FILE_SIZE)
-
-# Check for python 2.6
-AM_PATH_PYTHON([2.6])
-
-# Specify the path for ubuntu-sso-client source
-AC_MSG_CHECKING([for ubuntu-sso-client])
-AC_ARG_WITH([sso],
-	AC_HELP_STRING([--with-sso],
-			[Specify path to ubuntu-sso-client [default=auto]]),
-	[with_sso=$withval],
-	[with_sso=auto])
-SSO_PATH=""
-if test "x$with_sso" = "xauto"; then
-    SSO_PATH=""
-    AC_MSG_RESULT([using system path])
-else
-    SSO_PATH="$with_sso"
-	AC_MSG_RESULT([$SSO_PATH])
-fi
-AC_SUBST(SSO_PATH)
-
-# Specify the path for ubuntuone-storage-protocol source
-AC_MSG_CHECKING([for ubuntuone-storage-protocol])
-AC_ARG_WITH([protocol],
-	AC_HELP_STRING([--with-protocol],
-			[Specify path to storage protocol [default=auto]]),
-	[with_protocol=$withval],
-	[with_protocol=auto])
-USP_PATH=""
-if test "x$with_protocol" = "xauto"; then
-   USP_PATH=""
-   AC_MSG_RESULT([using system path])
-else
-   USP_PATH="$with_protocol"
-   AC_MSG_RESULT([$USP_PATH])
-fi
-AC_SUBST(USP_PATH)
-
-PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.70])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-##################################################
-# Check for gtk-doc.
-##################################################
-GTK_DOC_CHECK(1.0)
-DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --enable-debug"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-##################################################
-# Check for introspection
-##################################################
-GOBJECT_INTROSPECTION_CHECK([0.6.4])
-AC_MSG_CHECKING([if gobject-introspection requires new options])
-$PKG_CONFIG --atleast-version=0.9.4 gobject-introspection-1.0
-new_introspection=$?
-if test "x$new_introspection" = "x0"; then
-   AC_MSG_RESULT([yes])
-else
-   AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL([HAVE_NEW_INTROSPECTION], [test "x$new_introspection" = "x0"])
-
-# Fix up some junk from GIR
-if test "x$found_introspection" = "xyes"; then
-   INTROSPECTION_GIRDIR_NAME="`basename ${INTROSPECTION_GIRDIR}`"
-   INTROSPECTION_TYPELIBDIR_NAME="`basename ${INTROSPECTION_TYPELIBDIR}`"
-   AC_SUBST(INTROSPECTION_GIRDIR_NAME)
-   AC_SUBST(INTROSPECTION_TYPELIBDIR_NAME)
-fi
-
-dnl glib-genmarshal
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
-LIBSYNCDAEMON_CURRENT=1
-LIBSYNCDAEMON_REVISION=0
-LIBSYNCDAEMON_AGE=0
-AC_SUBST(LIBSYNCDAEMON_CURRENT)
-AC_SUBST(LIBSYNCDAEMON_REVISION)
-AC_SUBST(LIBSYNCDAEMON_AGE)
-
-dnl ---------------------------------------------------------------------------
-dnl - Are we specifying a different dbus root ?
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(dbus-services,
-              [AC_HELP_STRING([--with-dbus-services=<dir>],
-              [where D-BUS services directory is])])
-if ! test -z "$with_dbus_services" ; then
-	DBUS_SERVICES_DIR="$with_dbus_services"
-else
-	# D-BUS 0.23 and higher use $prefix/share/dbus-1/services
-	DBUS_SERVICES_DIR="\${datadir}/dbus-1/services"
-fi
-AC_SUBST(DBUS_SERVICES_DIR)
-
-dnl Strings to pass to SSO data
-SSO_APP_NAME="Ubuntu One"
-SSO_TC_URL="https://one.ubuntu.com/terms/"
-SSO_PING_URL="https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
-AC_SUBST(SSO_APP_NAME)
-AC_SUBST(SSO_TC_URL)
-AC_SUBST(SSO_PING_URL)
-AC_DEFINE_UNQUOTED([SSO_APP_NAME], ["$SSO_APP_NAME"], ["The Ubuntu One app name."])
-AC_DEFINE_UNQUOTED([SSO_TC_URL], ["$SSO_TC_URL"], ["The Ubuntu One terms and conditions URL."])
-AC_DEFINE_UNQUOTED([SSO_PING_URL], ["$SSO_PING_URL"], ["The Ubuntu One url to ping to when new tokens are stored."])
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-libsyncdaemon/Makefile
-libsyncdaemon/libsyncdaemon-1.0.pc
-po/Makefile.in
-docs/Makefile
-docs/reference/Makefile
-])
-
-if [[ -n "$(lsb_release -r | grep -v '1[2-9].[0-9][0-9]')" ]]; then 
-    REACTOR="glib"; 
-else
-    REACTOR="gi"
-fi
-AC_SUBST(REACTOR)
-
-AC_OUTPUT

=== renamed file 'tests/platform/check_reactor_import.py' => 'contrib/check-reactor-import' (properties changed: -x to +x)
--- tests/platform/check_reactor_import.py	2012-07-30 21:44:45 +0000
+++ contrib/check-reactor-import	2013-07-10 19:40:32 +0000
@@ -40,9 +40,12 @@
 
 import __builtin__
 
+import os
 import sys
 import traceback
 
+sys.path.append(os.path.abspath(os.getcwd()))
+
 
 def fake_import(*args, **kwargs):
     """A wrapper for __import__ that dies when importing reactor."""

=== renamed file 'ubuntuone/syncdaemon/fsm/fsm_draw.py' => 'contrib/draw-fsm' (properties changed: -x to +x)
--- ubuntuone/syncdaemon/fsm/fsm_draw.py	2012-04-09 20:07:05 +0000
+++ contrib/draw-fsm	2013-07-10 19:40:32 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # ubuntuone.syncdaemon.fsm.fsm_draw - draw a fsm
 #
 # Author: Lucio Torre <[e-mail]>
@@ -35,7 +36,7 @@
 import sys
 
 # pylint: disable-msg=F0401
-import gtk
+from gi.repository import Gtk as gtk
 
 import xdot
 from ubuntuone.syncdaemon.fsm import fsm

=== removed file 'data/Makefile.am'
--- data/Makefile.am	2013-02-13 20:57:13 +0000
+++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-
-apportdir = $(datadir)/apport/package-hooks
-apport_DATA = source_ubuntuone-client.py
-
-crashdbdir = $(sysconfdir)/apport/crashdb.conf.d
-crashdb_DATA = ubuntuone-client-crashdb.conf
-
-configdir = $(sysconfdir)/xdg/ubuntuone
-config_in_files = logging.conf.in
-config_out_files = $(config_in_files:.conf.in=.conf)
-config_files = syncdaemon.conf
-config_DATA = $(config_files) $(config_out_files)
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = ubuntuone-launch.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-%.conf: %.conf.in
-	@sed -e "s|\@LOG_LEVEL\@|$(LOG_LEVEL)|" \
-		-e "s|\@LOG_FILE_SIZE\@|$(LOG_FILE_SIZE)|" $< > $@
-
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = \
-	com.ubuntuone.SyncDaemon.service.in	\
-	com.ubuntuone.Credentials.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-%.service: %.service.in
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" $< > $@
-
-EXTRA_DIST =			\
-	$(config_in_files)	\
-	$(config_files)		\
-	$(autostart_in_files)     \
-	$(service_in_files)	\
-	$(apport_DATA)		\
-	$(crashdb_DATA)
-
-CLEANFILES =		\
-	$(config_out_files)	\
-	$(autostart_DATA) \
-	$(service_DATA)
-
-MAINTAINERCLEANFILES =	\
-	Makefile.in

=== removed file 'docs/Makefile.am'
--- docs/Makefile.am	2012-03-13 16:53:57 +0000
+++ docs/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-SUBDIRS = reference
-
-manfilesdir = $(mandir)/man1
-manfiles_DATA =				\
-	man/u1sdtool.1
-
-EXTRA_DIST=$(manfiles_DATA)

=== removed directory 'docs/reference'
=== removed file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am	2010-10-19 15:38:45 +0000
+++ docs/reference/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# Dummy targets we need to make distcheck and check pass
-test test-report perf-report full-report:
-	## Ignore
-
-# automake requirements
-AUTOMAKE_OPTIONS = 1.7
-
-# The name of the module
-DOC_MODULE=libsyncdaemon
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-DOC_SOURCE_DIR=../../libsyncdaemon
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# Fx --rebuild-types --rebuild-sections
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files=trio
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-HFILE_GLOB=$(top_srcdir)/libsyncdaemon/syncdaemon-*.h
-CFILE_GLOB=$(top_srcdir)/libsyncdaemon/syncdaemon-*.c
-
-# Header files to ignore when scanning.
-IGNORE_HFILES=			\
-	utils.h
-
-# Images to copy into HTML directory.
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-content_files = 
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-INCLUDES=-I$(top_srcdir)/libsyncdaemon   \
-         $(DBUS_CFLAGS)
-
-GTKDOC_LIBS=$(DBUS_LIBS) \
-            $(top_builddir)/libsyncdaemon/libsyncdaemon-1.0.la
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += \
-	libsyncdaemon.types        \
-	libsyncdaemon-docs.sgml
-#	libsyncdaemon-sections.txt
-

=== removed file 'docs/reference/libsyncdaemon-docs.sgml'
--- docs/reference/libsyncdaemon-docs.sgml	2010-10-19 13:28:23 +0000
+++ docs/reference/libsyncdaemon-docs.sgml	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<book id="index">
-  <bookinfo>
-    <title>libsyncdaemon Reference Manual</title>
-    <releaseinfo>
-      for libsyncdaemon [VERSION].
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://[SERVER]/libsyncdaemon/index.html">http://[SERVER]/libsyncdaemon/</ulink>.
-    </releaseinfo>
-  </bookinfo>
-
-  <chapter>
-    <title>[Insert title here]</title>
-        <xi:include href="xml/syncdaemon-metadata.xml"/>
-    <xi:include href="xml/syncdaemon-events-interface.xml"/>
-    <xi:include href="xml/syncdaemon-file-info.xml"/>
-    <xi:include href="xml/syncdaemon-transfer-info.xml"/>
-    <xi:include href="xml/syncdaemon-share-info.xml"/>
-    <xi:include href="xml/syncdaemon-filesystem-interface.xml"/>
-    <xi:include href="xml/syncdaemon-status-interface.xml"/>
-    <xi:include href="xml/syncdaemon-config-interface.xml"/>
-    <xi:include href="xml/syncdaemon-publicfiles-interface.xml"/>
-    <xi:include href="xml/syncdaemon-authentication.xml"/>
-    <xi:include href="xml/syncdaemon-shares-interface.xml"/>
-    <xi:include href="xml/syncdaemon-credentials.xml"/>
-    <xi:include href="xml/syncdaemon-folders-interface.xml"/>
-    <xi:include href="xml/syncdaemon-daemon.xml"/>
-    <xi:include href="xml/syncdaemon-interface.xml"/>
-    <xi:include href="xml/syncdaemon-folder-info.xml"/>
-    <xi:include href="xml/syncdaemon-status-info.xml"/>
-
-  </chapter>
-  <chapter id="object-tree">
-    <title>Object Hierarchy</title>
-     <xi:include href="xml/tree_index.sgml"/>
-  </chapter>
-  <index id="api-index-full">
-    <title>API Index</title>
-    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-  </index>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-</book>

=== removed directory 'libsyncdaemon'
=== removed file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am	2012-09-17 19:18:24 +0000
+++ libsyncdaemon/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-CLEANFILES = $(NULL)
-
-lib_LTLIBRARIES = libsyncdaemon-1.0.la
-
-noinst_PROGRAMS = test-libsyncdaemon
-
-INCLUDES =						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(top_srcdir)					\
-	$(DBUS_CFLAGS)
-
-# Marshallers
-MARSHAL_GENERATED = syncdaemon-marshal.c syncdaemon-marshal.h
-
-syncdaemon-marshal.h: syncdaemon-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=_syncdaemon_marshal > $@
-
-syncdaemon-marshal.c: syncdaemon-marshal.list $(GLIB_GENMARSHAL) syncdaemon-marshal.h
-	$(GLIB_GENMARSHAL) $< --body --prefix=_syncdaemon_marshal > $@
-
-syncdaemonincludedir = $(includedir)/libsyncdaemon-1.0/libsyncdaemon
-syncdaemoninclude_HEADERS =			\
-	libsyncdaemon.h				\
-	syncdaemon-authentication.h		\
-	syncdaemon-daemon.h			\
-	syncdaemon-config-interface.h		\
-	syncdaemon-credentials.h		\
-	syncdaemon-events-interface.h		\
-	syncdaemon-file-info.h			\
-	syncdaemon-filesystem-interface.h	\
-	syncdaemon-folder-info.h		\
-	syncdaemon-folders-interface.h		\
-	syncdaemon-metadata.h			\
-	syncdaemon-publicfiles-interface.h	\
-	syncdaemon-share-info.h			\
-	syncdaemon-shares-interface.h		\
-	syncdaemon-status-info.h		\
-	syncdaemon-status-interface.h		\
-	syncdaemon-transfer-info.h		\
-	syncdaemon-interface.h
-
-libsyncdaemon_1_0_la_SOURCES =			\
-	syncdaemon-marshal.c			\
-	syncdaemon-authentication.c		\
-	syncdaemon-daemon.c			\
-	syncdaemon-config-interface.c		\
-	syncdaemon-credentials.c		\
-	syncdaemon-events-interface.c		\
-	syncdaemon-file-info.c			\
-	syncdaemon-filesystem-interface.c	\
-	syncdaemon-folder-info.c		\
-	syncdaemon-folders-interface.c		\
-	syncdaemon-metadata.c			\
-	syncdaemon-publicfiles-interface.c	\
-	syncdaemon-share-info.c			\
-	syncdaemon-shares-interface.c		\
-	syncdaemon-status-info.c		\
-	syncdaemon-status-interface.c		\
-	syncdaemon-transfer-info.c		\
-	syncdaemon-interface.c			\
-	utils.c
-
-libsyncdaemon_1_0_la_LIBADD  =	\
-	$(DBUS_LIBS)
-libsyncdaemon_1_0_la_LDFLAGS = -version-info $(LIBSYNCDAEMON_CURRENT):$(LIBSYNCDAEMON_REVISION):$(LIBSYNCDAEMON_AGE)
-
-test_libsyncdaemon_SOURCES = test-libsyncdaemon.c
-test_libsyncdaemon_LDADD = libsyncdaemon-1.0.la $(DBUS_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsyncdaemon-1.0.pc
-
-MAINTAINERCLEANFILES =		\
-	Makefile.in				\
-	$(MARSHAL_GENERATED)
-
-EXTRA_DIST =				\
-	syncdaemon-marshal.list	\
-	utils.h					\
-	$(MARSHAL_GENERATED)
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-INTROSPECTION_SCANNER_ARGS =		\
-	--add-include-path=$(srcdir)	\
-	--c-include="libsyncdaemon/libsyncdaemon.h"
-
-if HAVE_NEW_INTROSPECTION
-INTROSPECTION_SCANNER_ARGS += --identifier-prefix=Syncdaemon --warn-all
-endif
-
-if HAVE_INTROSPECTION
-introspection_files =				\
-	$(syncdaemoninclude_HEADERS)		\
-        $(shell ls syncdaemon*.[ch])
-Syncdaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
-Syncdaemon_1_0_gir_NAMESPACE = Syncdaemon
-Syncdaemon_1_0_gir_INCLUDES = GObject-2.0
-Syncdaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
-Syncdaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
-Syncdaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
-Syncdaemon_1_0_gir_EXPORT_PACKAGES = libsyncdaemon-1.0
-INTROSPECTION_GIRS += Syncdaemon-1.0.gir
-
-girdir = $(datadir)/$(INTROSPECTION_GIRDIR_NAME)
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/$(INTROSPECTION_TYPELIBDIR_NAME)
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-
-endif # HAVE_INTROSPECTION

=== removed file 'libsyncdaemon/libsyncdaemon-1.0.pc.in'
--- libsyncdaemon/libsyncdaemon-1.0.pc.in	2010-06-24 12:14:39 +0000
+++ libsyncdaemon/libsyncdaemon-1.0.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
-
-Name: libsyncdaemon
-Description: Ubuntu One SyncDaemon access library
-Version: @VERSION@
-Libs: -L${libdir} -lsyncdaemon-1.0
-Cflags: -I${includedir}/libsyncdaemon-1.0
-Requires: gobject-2.0

=== removed file 'libsyncdaemon/libsyncdaemon.h'
--- libsyncdaemon/libsyncdaemon.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/libsyncdaemon.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include <libsyncdaemon/syncdaemon-authentication.h>
-#include <libsyncdaemon/syncdaemon-config-interface.h>
-#include <libsyncdaemon/syncdaemon-credentials.h>
-#include <libsyncdaemon/syncdaemon-daemon.h>
-#include <libsyncdaemon/syncdaemon-events-interface.h>
-#include <libsyncdaemon/syncdaemon-file-info.h>
-#include <libsyncdaemon/syncdaemon-filesystem-interface.h>
-#include <libsyncdaemon/syncdaemon-folder-info.h>
-#include <libsyncdaemon/syncdaemon-folders-interface.h>
-#include <libsyncdaemon/syncdaemon-interface.h>
-#include <libsyncdaemon/syncdaemon-publicfiles-interface.h>
-#include <libsyncdaemon/syncdaemon-share-info.h>
-#include <libsyncdaemon/syncdaemon-shares-interface.h>
-#include <libsyncdaemon/syncdaemon-status-info.h>
-#include <libsyncdaemon/syncdaemon-status-interface.h>
-#include <libsyncdaemon/syncdaemon-transfer-info.h>

=== removed file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	1970-01-01 00:00:00 +0000
@@ -1,298 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#include <string.h>
-#include <glib/gi18n-lib.h>
-#include <dbus/dbus-glib.h>
-#include "syncdaemon-authentication.h"
-#include "syncdaemon-marshal.h"
-
-G_DEFINE_TYPE(SyncdaemonAuthentication, syncdaemon_authentication, G_TYPE_OBJECT)
-
-struct _SyncdaemonAuthenticationPrivate {
-	DBusGConnection *bus;
-	DBusGProxy *proxy;
-	gboolean has_credentials;
-	SyncdaemonCredentials *credentials;
-};
-
-/* Signals */
-enum {
-	CREDENTIALS_FOUND_SIGNAL,
-	AUTHORIZATION_CANCELLED_SIGNAL,
-	ERROR_SIGNAL,
-	LAST_SIGNAL
-};
-
-static guint auth_signals[LAST_SIGNAL] = { 0, };
-
-static void
-syncdaemon_authentication_finalize (GObject *object)
-{
-	SyncdaemonAuthentication *auth = SYNCDAEMON_AUTHENTICATION (object);
-
-	if (auth->priv != NULL) {
-		if (auth->priv->credentials != NULL)
-			g_object_unref (G_OBJECT (auth->priv->credentials));
-		if (auth->priv->proxy != NULL)
-			g_object_unref (G_OBJECT (auth->priv->proxy));
-		if (auth->priv->bus != NULL)
-			dbus_g_connection_unref (auth->priv->bus);
-
-		g_free (auth->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_authentication_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_authentication_class_init (SyncdaemonAuthenticationClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_authentication_finalize;
-
-	/* Register signals */
-	auth_signals[CREDENTIALS_FOUND_SIGNAL] = g_signal_new ("credentials_found",
-							       G_TYPE_FROM_CLASS (klass),
-							       (GSignalFlags) G_SIGNAL_RUN_LAST,
-							       G_STRUCT_OFFSET (SyncdaemonAuthenticationClass, credentials_found),
-							       NULL, NULL,
-							       g_cclosure_marshal_VOID__OBJECT,
-							       G_TYPE_NONE, 1,
-							       G_TYPE_OBJECT);
-	auth_signals[AUTHORIZATION_CANCELLED_SIGNAL] = g_signal_new ("authorization_cancelled",
-								     G_TYPE_FROM_CLASS (klass),
-								     (GSignalFlags) G_SIGNAL_RUN_LAST,
-								     G_STRUCT_OFFSET (SyncdaemonAuthenticationClass, authorization_cancelled),
-								     NULL, NULL,
-								     g_cclosure_marshal_VOID__VOID,
-								     G_TYPE_NONE, 0);
-	auth_signals[ERROR_SIGNAL] = g_signal_new ("error",
-						   G_TYPE_FROM_CLASS (klass),
-						   (GSignalFlags) G_SIGNAL_RUN_LAST,
-						   G_STRUCT_OFFSET (SyncdaemonAuthenticationClass, error),
-						   NULL, NULL,
-						   g_cclosure_marshal_VOID__STRING,
-						   G_TYPE_NONE, 1,
-						   G_TYPE_STRING);
-}
-
-static void
-credentials_found_cb (DBusGProxy *proxy, GHashTable *result, gpointer user_data)
-{
-	SyncdaemonAuthentication *auth = SYNCDAEMON_AUTHENTICATION (user_data);
-
-	g_debug ("Authorization completed!");
-
-	if (auth->priv->credentials != NULL)
-		g_object_unref (G_OBJECT (auth->priv->credentials));
-
-	auth->priv->credentials = syncdaemon_credentials_new_from_hash_table (result);
-	auth->priv->has_credentials = TRUE;
-
-	g_signal_emit (auth, auth_signals[CREDENTIALS_FOUND_SIGNAL], 0, auth->priv->credentials);
-}
-
-static void
-authorization_denied_cb (DBusGProxy *proxy, gpointer user_data)
-{
-	g_debug ("Authorization denied");
-
-	g_signal_emit (user_data, auth_signals[AUTHORIZATION_CANCELLED_SIGNAL], 0);
-}
-
-static void
-credentials_error_cb (DBusGProxy *proxy, GHashTable *error_dict, gpointer user_data)
-{
-	g_debug ("Authorization error");
-
-	g_signal_emit (user_data, auth_signals[ERROR_SIGNAL], 0,
-	               g_hash_table_lookup (error_dict, "message"));
-}
-
-static void
-credentials_not_found_cb (DBusGProxy *proxy, gpointer user_data)
-{
-	SyncdaemonAuthentication *auth = SYNCDAEMON_AUTHENTICATION (user_data);
-
-	g_debug ("Credentials for Ubuntu One not found!");
-
-	if (auth->priv->credentials != NULL)
-		g_object_unref (G_OBJECT (auth->priv->credentials));
-	auth->priv->has_credentials = FALSE;
-
-	g_signal_emit (auth, auth_signals[ERROR_SIGNAL], 0,
-	               "Credentials not found.");
-}
-
-static void
-syncdaemon_authentication_init (SyncdaemonAuthentication *auth)
-{
-	GError *error = NULL;
-
-	auth->priv = g_new0 (SyncdaemonAuthenticationPrivate, 1);
-	auth->priv->has_credentials = FALSE;
-
-	/* Initialize DBus */
-	auth->priv->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_warning ("Couldn't get session bus: %s", error->message);
-		g_error_free (error);
-	} else {
-		auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntuone.Credentials",
-		                                               "/credentials", "com.ubuntuone.CredentialsManagement");
-		if (auth->priv->proxy != NULL) {
-			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsFound",
-						 dbus_g_type_get_map ("GHashTable",
-								      G_TYPE_STRING,
-								      G_TYPE_STRING),
-						 G_TYPE_INVALID);
-			dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsFound",
-						     G_CALLBACK (credentials_found_cb), auth, NULL);
-
-			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsNotFound",
-			                         G_TYPE_INVALID);
-			dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsNotFound",
-			                             G_CALLBACK (credentials_not_found_cb), auth, NULL);
-
-			dbus_g_proxy_add_signal (auth->priv->proxy, "AuthorizationDenied",
-						 G_TYPE_INVALID);
-			dbus_g_proxy_connect_signal (auth->priv->proxy, "AuthorizationDenied",
-						     G_CALLBACK (authorization_denied_cb), auth, NULL);
-
-			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsError",
-						 dbus_g_type_get_map ("GHashTable",
-								      G_TYPE_STRING,
-								      G_TYPE_STRING),
-						 G_TYPE_INVALID);
-			dbus_g_proxy_connect_signal (auth->priv->proxy, "CredentialsError",
-						     G_CALLBACK (credentials_error_cb), auth, NULL);
-		} else
-			g_warning ("Couldn't get proxy for com.ubuntuone.CredentialsManagement");
-
-	}
-}
-
-/**
- * syncdaemon_authentication_find_credentials:
- */
-SyncdaemonCredentials *
-syncdaemon_authentication_find_credentials (SyncdaemonAuthentication *auth)
-{
-	SyncdaemonCredentials *result = NULL;
-	g_return_val_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth), NULL);
-
-	if (!auth->priv->has_credentials) {
-		GHashTable *credentials;
-		GError *error = NULL;
-
-		if (dbus_g_proxy_call (auth->priv->proxy, "find_credentials_sync", &error,
-				       G_TYPE_INVALID,
-				       dbus_g_type_get_map ("GHashTable",
-				                            G_TYPE_STRING,
-				                            G_TYPE_STRING), &credentials,
-				       G_TYPE_INVALID)) {
-			if (g_hash_table_size (credentials) >= 4) {
-				auth->priv->credentials = syncdaemon_credentials_new_from_hash_table (credentials);
-				auth->priv->has_credentials = TRUE;
-				result = auth->priv->credentials;
-			} else {
-				g_debug ("Got less number of items (%i) in credentials hash table than expected (4)!",
-				         g_hash_table_size (credentials));
-				}
-			g_hash_table_destroy (credentials);
-		} else {
-			g_warning ("Could not get credentials: %s", error->message);
-			g_error_free (error);
-		}
-	}
-
-	return result;
-}
-
-/**
- * syncdaemon_authentication_has_credentials:
- */
-gboolean
-syncdaemon_authentication_has_credentials (SyncdaemonAuthentication *auth)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth), FALSE);
-
-	if (auth->priv->has_credentials)
-		return TRUE;
-
-	return syncdaemon_authentication_find_credentials (auth) != NULL;
-}
-
-/**
- * syncdaemon_authentication_login_or_register:
- */
-void
-syncdaemon_authentication_login_or_register (SyncdaemonAuthentication *auth)
-{
-	GHashTable *params = g_hash_table_new (g_str_hash, g_str_equal);
-
-	g_return_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth));
-
-	g_hash_table_insert (params, "window_id", "0"); /* FIXME: get window ID */
-
-	dbus_g_proxy_call_no_reply (auth->priv->proxy, "register",
-				    dbus_g_type_get_map ("GHashTable",
-				                         G_TYPE_STRING,
-				                         G_TYPE_STRING), params,
-				    G_TYPE_INVALID,
-				    G_TYPE_INVALID);
-
-	g_hash_table_destroy (params);
-}
-
-/**
- * syncdaemon_authentication_clear_token:
- */
-void
-syncdaemon_authentication_clear_token (SyncdaemonAuthentication *auth)
-{
-	GError *error = NULL;
-
-	g_return_if_fail (SYNCDAEMON_IS_AUTHENTICATION (auth));
-
-	if (!dbus_g_proxy_call (auth->priv->proxy, "clear_credentials", &error,
-		                    G_TYPE_INVALID,
-		                    G_TYPE_INVALID)) {
-		g_warning ("Error calling 'clear_credentials': %s", error->message);
-		g_error_free (error);
-	}
-}

=== removed file 'libsyncdaemon/syncdaemon-authentication.h'
--- libsyncdaemon/syncdaemon-authentication.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-authentication.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_AUTHENTICATION_H__
-#define __SYNCDAEMON_AUTHENTICATION_H__
-
-#include <glib-object.h>
-#include "syncdaemon-credentials.h"
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_AUTHENTICATION                (syncdaemon_authentication_get_type ())
-#define SYNCDAEMON_AUTHENTICATION(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthentication))
-#define SYNCDAEMON_IS_AUTHENTICATION(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_AUTHENTICATION))
-#define SYNCDAEMON_AUTHENTICATION_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthenticationClass))
-#define SYNCDAEMON_IS_AUTHENTICATION_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_AUTHENTICATION))
-#define SYNCDAEMON_AUTHENTICATION_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_AUTHENTICATION, SyncdaemonAuthenticationClass))
-
-typedef struct _SyncdaemonAuthenticationPrivate SyncdaemonAuthenticationPrivate;
-
-typedef struct {
-	GObject parent;
-	SyncdaemonAuthenticationPrivate *priv;
-} SyncdaemonAuthentication;
-
-typedef struct {
-	GObjectClass parent_class;
-
-	void (* credentials_found) (SyncdaemonAuthentication *auth, SyncdaemonCredentials *credentials);
-	void (* authorization_cancelled) (SyncdaemonAuthentication *auth);
-	void (* error) (SyncdaemonAuthentication *auth, const gchar *error);
-} SyncdaemonAuthenticationClass;
-
-GType                     syncdaemon_authentication_get_type (void);
-SyncdaemonAuthentication *syncdaemon_authentication_new (void);
-
-SyncdaemonCredentials    *syncdaemon_authentication_find_credentials (SyncdaemonAuthentication *auth);
-gboolean                  syncdaemon_authentication_has_credentials (SyncdaemonAuthentication *auth);
-void                      syncdaemon_authentication_login_or_register (SyncdaemonAuthentication *auth);
-void                      syncdaemon_authentication_clear_token (SyncdaemonAuthentication *auth);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-config-interface.c'
--- libsyncdaemon/syncdaemon-config-interface.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-config-interface.c	1970-01-01 00:00:00 +0000
@@ -1,276 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#ifdef HAVE_GDBUS
-#else
-#include <dbus/dbus-glib.h>
-#endif
-#include "syncdaemon-config-interface.h"
-
-G_DEFINE_TYPE(SyncdaemonConfigInterface, syncdaemon_config_interface, SYNCDAEMON_TYPE_INTERFACE)
-
-struct _SyncdaemonConfigInterfacePrivate {
-	GObject *proxy;
-};
-
-static void
-syncdaemon_config_interface_finalize (GObject *object)
-{
-	SyncdaemonConfigInterface *interface = SYNCDAEMON_CONFIG_INTERFACE (object);
-
-	if (interface->priv != NULL) {
-		g_free (interface->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_config_interface_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_config_interface_class_init (SyncdaemonConfigInterfaceClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_config_interface_finalize;
-}
-
-static void
-syncdaemon_config_interface_init (SyncdaemonConfigInterface *interface)
-{
-	interface->priv = g_new0 (SyncdaemonConfigInterfacePrivate, 1);
-
-	/* Setup DBus proxy */
-	interface->priv->proxy = syncdaemon_interface_setup_proxy (SYNCDAEMON_INTERFACE (interface),
-								   "com.ubuntuone.SyncDaemon",
-								   "/config", "com.ubuntuone.SyncDaemon.Config");
-}
-
-/**
- * syncdaemon_config_interface_new:
- */
-SyncdaemonConfigInterface *
-syncdaemon_config_interface_new (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return g_object_new (SYNCDAEMON_TYPE_CONFIG_INTERFACE, "daemon", daemon, NULL);
-}
-
-static gboolean
-get_boolean_method (SyncdaemonConfigInterface *interface, const gchar *method)
-{
-	gboolean enabled;
-	GError *error = NULL;
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), method, &error,
-				G_TYPE_INVALID,
-				G_TYPE_BOOLEAN, &enabled,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling %s: %s", method, error->message);
-		g_error_free (error);
-
-		return FALSE;
-	}
-
-	return enabled;
-}
-
-static void
-enable_setting_method (SyncdaemonConfigInterface *interface,
-		       const gchar *enable_method,
-		       const gchar *disable_method,
-		       gboolean enabled)
-{
-	GError *error = NULL;
-
-	if (enabled) {
-		dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), enable_method, &error,
-					    G_TYPE_INVALID,
-					    G_TYPE_INVALID);
-	} else {
-		dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), disable_method, &error,
-					    G_TYPE_INVALID,
-					    G_TYPE_INVALID);
-	}
-
-	if (error) {
-	    g_warning ("Failed calling %s: %s", enabled ? enable_method : disable_method, error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * syncdaemon_config_interface_get_bandwidth_throttling:
- */
-gboolean
-syncdaemon_config_interface_get_bandwidth_throttling (SyncdaemonConfigInterface *interface)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface), FALSE);
-
-	return get_boolean_method (interface, "bandwidth_throttling_enabled");
-}
-
-/**
- * syncdaemon_config_interface_set_bandwidth_throttling:
- */
-void
-syncdaemon_config_interface_set_bandwidth_throttling (SyncdaemonConfigInterface *interface, gboolean enabled)
-{
-    	g_return_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface));
-
-	enable_setting_method (interface, "enable_bandwidth_throttling", "disable_bandwidth_throttling", enabled);
-}
-
-/**
- * syncdaemon_config_interface_get_files_sync:
- */
-gboolean
-syncdaemon_config_interface_get_files_sync (SyncdaemonConfigInterface *interface)
-{
-	gboolean enabled;
-	GError *error = NULL;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface), FALSE);
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "files_sync_enabled", &error,
-				G_TYPE_INVALID,
-				G_TYPE_BOOLEAN, &enabled,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling files_sync_enabled: %s", error->message);
-		g_error_free (error);
-
-		return FALSE;
-	}
-
-	return enabled;
-}
-
-/**
- * syncdaemon_config_interface_set_files_sync:
- */
-void
-syncdaemon_config_interface_set_files_sync (SyncdaemonConfigInterface *interface, gboolean enabled)
-{
-	GError *error = NULL;
-
-	g_return_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface));
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "set_files_sync_enabled", &error,
-				G_TYPE_BOOLEAN, enabled,
-				G_TYPE_INVALID,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling set_files_sync_enabled: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * syncdaemon_config_interface_get_throttling_limits:
- */
-void
-syncdaemon_config_interface_get_throttling_limits (SyncdaemonConfigInterface *interface,
-						   gint *download,
-						   gint *upload)
-{
-	GHashTable *result;
-	GError *error = NULL;
-
-	g_return_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface));
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "get_throttling_limits", &error,
-				G_TYPE_INVALID,
-				dbus_g_type_get_map ("GHashTable",
-						     G_TYPE_STRING,
-						     G_TYPE_INT), &result,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling get_throttling_limits: %s", error->message);
-		g_error_free (error);
-	} else {
-		gint *download_got, *upload_got;
-
-		download_got = g_hash_table_lookup (result, "download");
-		upload_got = g_hash_table_lookup (result, "upload");
-
-		if (download != NULL)
-			*download = *download_got;
-		if (upload != NULL)
-			*upload = *upload_got;
-
-		g_hash_table_destroy (result);
-	}
-}
-
-/**
- * syncdaemon_config_interface_set_throttling_limits:
- */
-void
-syncdaemon_config_interface_set_throttling_limits (SyncdaemonConfigInterface *interface,
-						   gint download,
-						   gint upload)
-{
-	GError *error = NULL;
-
-	g_return_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface));
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "set_throttling_limits", &error,
-				G_TYPE_INT, download,
-				G_TYPE_INT, upload,
-				G_TYPE_INVALID,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling set_throttling_limits: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * syncdaemon_config_interface_get_udf_autosubscribe:
- */
-gboolean
-syncdaemon_config_interface_get_udf_autosubscribe (SyncdaemonConfigInterface *interface)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface), FALSE);
-
-	return get_boolean_method (interface, "udf_autosubscribe_enabled");
-}
-
-/**
- * syncdaemon_config_interface_set_bandwidth_throttling_enabled:
- */
-void
-syncdaemon_config_interface_set_udf_autosubscribe (SyncdaemonConfigInterface *interface, gboolean enabled)
-{
-      	g_return_if_fail (SYNCDAEMON_IS_CONFIG_INTERFACE (interface));
-
-	enable_setting_method (interface, "enable_udf_autosubscribe", "disable_udf_autosubscribe", enabled);
-}

=== removed file 'libsyncdaemon/syncdaemon-config-interface.h'
--- libsyncdaemon/syncdaemon-config-interface.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-config-interface.h	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_CONFIG_INTERFACE_H__
-#define __SYNCDAEMON_CONFIG_INTERFACE_H__
-
-#include "syncdaemon-daemon.h"
-#include "syncdaemon-interface.h"
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_CONFIG_INTERFACE                (syncdaemon_config_interface_get_type ())
-#define SYNCDAEMON_CONFIG_INTERFACE(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_CONFIG_INTERFACE, SyncdaemonConfigInterface))
-#define SYNCDAEMON_IS_CONFIG_INTERFACE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_CONFIG_INTERFACE))
-#define SYNCDAEMON_CONFIG_INTERFACE_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_CONFIG_INTERFACE, SyncdaemonConfigInterfaceClass))
-#define SYNCDAEMON_IS_CONFIG_INTERFACE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_CONFIG_INTERFACE))
-#define SYNCDAEMON_CONFIG_INTERFACE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_CONFIG_INTERFACE, SyncdaemonConfigInterfaceClass))
-
-typedef struct _SyncdaemonConfigInterfacePrivate SyncdaemonConfigInterfacePrivate;
-
-typedef struct {
-	SyncdaemonInterface parent;
-	SyncdaemonConfigInterfacePrivate *priv;
-} SyncdaemonConfigInterface;
-
-typedef struct {
-	SyncdaemonInterfaceClass parent_class;
-} SyncdaemonConfigInterfaceClass;
-
-GType                      syncdaemon_config_interface_get_type (void);
-
-SyncdaemonConfigInterface *syncdaemon_config_interface_new (SyncdaemonDaemon *daemon);
-
-gboolean                   syncdaemon_config_interface_get_bandwidth_throttling (SyncdaemonConfigInterface *interface);
-void                       syncdaemon_config_interface_set_bandwidth_throttling (SyncdaemonConfigInterface *interface,
-										 gboolean enabled);
-gboolean                   syncdaemon_config_interface_get_files_sync (SyncdaemonConfigInterface *interface);
-void                       syncdaemon_config_interface_set_files_sync (SyncdaemonConfigInterface *interface,
-								       gboolean enabled);
-void                       syncdaemon_config_interface_get_throttling_limits (SyncdaemonConfigInterface *interface,
-									      gint *download,
-									      gint *upload);
-void                       syncdaemon_config_interface_set_throttling_limits (SyncdaemonConfigInterface *interface,
-									      gint download,
-									      gint upload);
-gboolean                   syncdaemon_config_interface_get_udf_autosubscribe (SyncdaemonConfigInterface *interface);
-void                       syncdaemon_config_interface_set_udf_autosubscribe (SyncdaemonConfigInterface *interface,
-									      gboolean enabled);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-credentials.c'
--- libsyncdaemon/syncdaemon-credentials.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-credentials.c	1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "syncdaemon-credentials.h"
-
-G_DEFINE_TYPE(SyncdaemonCredentials, syncdaemon_credentials, G_TYPE_OBJECT)
-
-struct _SyncdaemonCredentialsPrivate {
-	gchar *consumer_key;
-	gchar *consumer_secret;
-	gchar *token;
-	gchar *token_secret;
-};
-
-static void
-syncdaemon_credentials_finalize (GObject *object)
-{
-	SyncdaemonCredentials *credentials = SYNCDAEMON_CREDENTIALS (object);
-
-	if (credentials->priv != NULL) {
-		if (credentials->priv->consumer_key != NULL)
-			g_free (credentials->priv->consumer_key);
-		if (credentials->priv->consumer_secret != NULL)
-			g_free (credentials->priv->consumer_secret);
-		if (credentials->priv->token != NULL)
-			g_free (credentials->priv->token);
-		if (credentials->priv->token_secret != NULL)
-			g_free (credentials->priv->token_secret);
-
-		g_free (credentials->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_credentials_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_credentials_class_init (SyncdaemonCredentialsClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_credentials_finalize;
-}
-
-static void
-syncdaemon_credentials_init (SyncdaemonCredentials *credentials)
-{
-	credentials->priv = g_new0 (SyncdaemonCredentialsPrivate, 1);
-}
-
-/**
- * syncdaemon_credentials_new:
- */
-SyncdaemonCredentials *
-syncdaemon_credentials_new (void)
-{
-	return g_object_new (SYNCDAEMON_TYPE_CREDENTIALS, NULL);
-}
-
-/**
- * syncdaemon_credentials_new_from_hash_table:
- */
-SyncdaemonCredentials *
-syncdaemon_credentials_new_from_hash_table (GHashTable *hash)
-{
-	SyncdaemonCredentials *credentials;
-
-	credentials = g_object_new (SYNCDAEMON_TYPE_CREDENTIALS, NULL);
-	if (hash != NULL) {
-		syncdaemon_credentials_set_consumer_key (
-			credentials,
-			g_hash_table_lookup (hash, "consumer_key"));
-		syncdaemon_credentials_set_consumer_secret (
-			credentials,
-			g_hash_table_lookup (hash, "consumer_secret"));
-		syncdaemon_credentials_set_token (
-			credentials,
-			g_hash_table_lookup (hash, "token"));
-		syncdaemon_credentials_set_token_secret (
-			credentials,
-			g_hash_table_lookup (hash, "token_secret"));
-	}
-
-	return credentials;
-}
-
-/**
- * syncdaemon_credentials_get_oauth_consumer_token:
- */
-const gchar *
-syncdaemon_credentials_get_consumer_key (SyncdaemonCredentials *credentials)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials), NULL);
-
-	return (const gchar *) credentials->priv->consumer_key;
-}
-
-/**
- * syncdaemon_credentials_set_consumer_key:
- */
-void
-syncdaemon_credentials_set_consumer_key (SyncdaemonCredentials *credentials, const gchar *consumer_key)
-{
-	g_return_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials));
-
-	if (credentials->priv->consumer_key != NULL)
-		g_free (credentials->priv->consumer_key);
-
-	credentials->priv->consumer_key = g_strdup (consumer_key);
-}
-
-/**
- * syncdaemon_credentials_get_consumer_secret:
- */
-const gchar *
-syncdaemon_credentials_get_consumer_secret (SyncdaemonCredentials *credentials)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials), NULL);
-
-	return (const gchar *) credentials->priv->consumer_secret;
-}
-
-/**
- * syncdaemon_credentials_set_consumer_secret:
- */
-void
-syncdaemon_credentials_set_consumer_secret (SyncdaemonCredentials *credentials, const gchar *consumer_secret)
-{
-	g_return_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials));
-
-	if (credentials->priv->consumer_secret != NULL)
-		g_free (credentials->priv->consumer_secret);
-
-	credentials->priv->consumer_secret = g_strdup (consumer_secret);
-}
-
-/**
- * syncdaemon_credentials_get_token:
- */
-const gchar *
-syncdaemon_credentials_get_token (SyncdaemonCredentials *credentials)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials), NULL);
-
-	return (const gchar *) credentials->priv->token;
-}
-
-/**
- * syncdaemon_credentials_set_token:
- */
-void
-syncdaemon_credentials_set_token (SyncdaemonCredentials *credentials, const gchar *token)
-{
-	g_return_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials));
-
-	if (credentials->priv->token != NULL)
-		g_free (credentials->priv->token);
-
-	credentials->priv->token = g_strdup (token);
-}
-
-/**
- * syncdaemon_credentials_get_token_secret:
- */
-const gchar *
-syncdaemon_credentials_get_token_secret (SyncdaemonCredentials *credentials)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials), NULL);
-
-	return (const gchar *) credentials->priv->token_secret;
-}
-
-/**
- * syncdaemon_credentials_set_token_secret:
- */
-void
-syncdaemon_credentials_set_token_secret (SyncdaemonCredentials *credentials, const gchar *token_secret)
-{
-	g_return_if_fail (SYNCDAEMON_IS_CREDENTIALS (credentials));
-
-	if (credentials->priv->token_secret != NULL)
-		g_free (credentials->priv->token_secret);
-
-	credentials->priv->token_secret = g_strdup (token_secret);
-}

=== removed file 'libsyncdaemon/syncdaemon-credentials.h'
--- libsyncdaemon/syncdaemon-credentials.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-credentials.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_CREDENTIALS_H__
-#define __SYNCDAEMON_CREDENTIALS_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_CREDENTIALS                (syncdaemon_credentials_get_type ())
-#define SYNCDAEMON_CREDENTIALS(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_CREDENTIALS, SyncdaemonCredentials))
-#define SYNCDAEMON_IS_CREDENTIALS(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_CREDENTIALS))
-#define SYNCDAEMON_CREDENTIALS_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_CREDENTIALS, SyncdaemonCredentialsClass))
-#define SYNCDAEMON_IS_CREDENTIALS_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_CREDENTIALS))
-#define SYNCDAEMON_CREDENTIALS_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_CREDENTIALS, SyncdaemonCredentialsClass))
-
-typedef struct _SyncdaemonCredentialsPrivate SyncdaemonCredentialsPrivate;
-
-typedef struct {
-	GObject parent;
-	SyncdaemonCredentialsPrivate *priv;
-} SyncdaemonCredentials;
-
-typedef struct {
-	GObjectClass parent_class;
-} SyncdaemonCredentialsClass;
-
-GType                  syncdaemon_credentials_get_type (void);
-SyncdaemonCredentials *syncdaemon_credentials_new (void);
-SyncdaemonCredentials *syncdaemon_credentials_new_from_hash_table (GHashTable *hash);
-
-const gchar           *syncdaemon_credentials_get_consumer_key (SyncdaemonCredentials *credentials);
-void                   syncdaemon_credentials_set_consumer_key (SyncdaemonCredentials *credentials, const gchar *consumer_key);
-const gchar           *syncdaemon_credentials_get_consumer_secret (SyncdaemonCredentials *credentials);
-void                   syncdaemon_credentials_set_consumer_secret (SyncdaemonCredentials *credentials, const gchar *consumer_secret);
-const gchar           *syncdaemon_credentials_get_token (SyncdaemonCredentials *credentials);
-void                   syncdaemon_credentials_set_token (SyncdaemonCredentials *credentials, const gchar *token);
-const gchar           *syncdaemon_credentials_get_token_secret (SyncdaemonCredentials *credentials);
-void                   syncdaemon_credentials_set_token_secret (SyncdaemonCredentials *credentials, const gchar *token_secret);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-daemon.c'
--- libsyncdaemon/syncdaemon-daemon.c	2012-04-13 23:36:32 +0000
+++ libsyncdaemon/syncdaemon-daemon.c	1970-01-01 00:00:00 +0000
@@ -1,1477 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#include <string.h>
-#ifdef HAVE_GDBUS
-#include <gio/gio.h>
-#else
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#endif
-#include "syncdaemon-daemon.h"
-#include "syncdaemon-config-interface.h"
-#include "syncdaemon-events-interface.h"
-#include "syncdaemon-filesystem-interface.h"
-#include "syncdaemon-folders-interface.h"
-#include "syncdaemon-publicfiles-interface.h"
-#include "syncdaemon-shares-interface.h"
-#include "syncdaemon-status-interface.h"
-#include "syncdaemon-marshal.h"
-
-#define SYNCDAEMON_DBUS_NAME "com.ubuntuone.SyncDaemon"
-
-G_DEFINE_TYPE(SyncdaemonDaemon, syncdaemon_daemon, G_TYPE_OBJECT)
-
-struct _SyncdaemonDaemonPrivate {
-#ifdef HAVE_GDBUS
-	GDBusConnection *bus;
-	GDbusProxy *dbus_proxy;
-#else
-	DBusGConnection *bus;
-	DBusGProxy *dbus_proxy;
-#endif
-
-	/* Interfaces */
-	GObject *daemon_interface;
-	GHashTable *subinterfaces;
-
-	/* Status */
-	gboolean ready;
-	gboolean connected;
-	gchar *root_dir;
-	SyncdaemonAuthentication *auth;
-};
-
-/* Signals */
-enum {
-	READY_SIGNAL,
-	CONNECTED_SIGNAL,
-	DISCONNECTED_SIGNAL,
-	STATUS_CHANGED_SIGNAL,
-	ERROR_SIGNAL,
-	EVENT_SIGNAL,
-	FOLDER_CREATED_SIGNAL,
-	FOLDER_DELETED_SIGNAL,
-	FOLDER_SUBSCRIBED_SIGNAL,
-	FOLDER_UNSUBSCRIBED_SIGNAL,
-	FILE_PUBLISHED_SIGNAL,
-	FILE_UNPUBLISHED_SIGNAL,
-	SHARE_CREATED_SIGNAL,
-	SHARE_DELETED_SIGNAL,
-	DOWNLOAD_STARTED_SIGNAL,
-	DOWNLOAD_FILE_PROGRESS_SIGNAL,
-	DOWNLOAD_FINISHED_SIGNAL,
-	UPLOAD_STARTED_SIGNAL,
-	UPLOAD_FILE_PROGRESS_SIGNAL,
-	UPLOAD_FINISHED_SIGNAL,
-	QUOTA_EXCEEDED_SIGNAL,
-	LAST_SIGNAL
-};
-
-static guint daemon_signals[LAST_SIGNAL] = { 0, };
-
-static void
-syncdaemon_daemon_finalize (GObject *object)
-{
-	SyncdaemonDaemon *daemon = SYNCDAEMON_DAEMON (object);
-
-	if (daemon->priv != NULL) {
-		g_hash_table_destroy (daemon->priv->subinterfaces);
-
-		if (daemon->priv->dbus_proxy != NULL)
-			g_object_unref (daemon->priv->dbus_proxy);
-
-		if (daemon->priv->bus != NULL) {
-#ifdef HAVE_GDBUS
-			g_object_unref (G_OBJECT (daemon->priv->bus));
-#else
-			dbus_g_connection_unref (daemon->priv->bus);
-#endif
-		}
-
-		if (daemon->priv->root_dir != NULL)
-			g_free (daemon->priv->root_dir);
-
-		if (daemon->priv->auth != NULL)
-			g_object_unref (G_OBJECT (daemon->priv->auth));
-
-		g_free (daemon->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_daemon_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_daemon_class_init (SyncdaemonDaemonClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_daemon_finalize;
-
-	/* Register signals */
-	daemon_signals[READY_SIGNAL] = g_signal_new ("ready",
-							 G_TYPE_FROM_CLASS (klass),
-							 (GSignalFlags) G_SIGNAL_RUN_LAST,
-							 G_STRUCT_OFFSET (SyncdaemonDaemonClass, ready),
-							 NULL, NULL,
-							 g_cclosure_marshal_VOID__VOID,
-							 G_TYPE_NONE, 0);
-	daemon_signals[CONNECTED_SIGNAL] = g_signal_new ("connected",
-							 G_TYPE_FROM_CLASS (klass),
-							 (GSignalFlags) G_SIGNAL_RUN_LAST,
-							 G_STRUCT_OFFSET (SyncdaemonDaemonClass, connected),
-							 NULL, NULL,
-							 g_cclosure_marshal_VOID__VOID,
-							 G_TYPE_NONE, 0);
-	daemon_signals[DISCONNECTED_SIGNAL] = g_signal_new ("disconnected",
-								G_TYPE_FROM_CLASS (klass),
-								(GSignalFlags) G_SIGNAL_RUN_LAST,
-								G_STRUCT_OFFSET (SyncdaemonDaemonClass, disconnected),
-								NULL, NULL,
-								g_cclosure_marshal_VOID__VOID,
-								G_TYPE_NONE, 0);
-	daemon_signals[STATUS_CHANGED_SIGNAL] = g_signal_new ("status_changed",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, status_changed),
-								  NULL, NULL,
-								  g_cclosure_marshal_VOID__OBJECT,
-								  G_TYPE_NONE, 1,
-								  G_TYPE_OBJECT);
-	daemon_signals[EVENT_SIGNAL] = g_signal_new ("event",
-							 G_TYPE_FROM_CLASS (klass),
-							 (GSignalFlags) G_SIGNAL_RUN_LAST,
-							 G_STRUCT_OFFSET (SyncdaemonDaemonClass, event),
-							 NULL, NULL,
-							 g_cclosure_marshal_VOID__POINTER,
-							 G_TYPE_NONE, 1,
-							 G_TYPE_POINTER);
-	daemon_signals[ERROR_SIGNAL] = g_signal_new ("error",
-							 G_TYPE_FROM_CLASS (klass),
-							 (GSignalFlags) G_SIGNAL_RUN_LAST,
-							 G_STRUCT_OFFSET (SyncdaemonDaemonClass, error),
-							 NULL, NULL,
-							 _syncdaemon_marshal_VOID__STRING_POINTER,
-							 G_TYPE_NONE, 2,
-							 G_TYPE_STRING, G_TYPE_POINTER);
-	daemon_signals[FOLDER_CREATED_SIGNAL] = g_signal_new ("folder_created",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, folder_created),
-								  NULL, NULL,
-								  _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								  G_TYPE_NONE, 2,
-								  G_TYPE_BOOLEAN,
-								  G_TYPE_OBJECT);
-	daemon_signals[FOLDER_DELETED_SIGNAL] = g_signal_new ("folder_deleted",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, folder_deleted),
-								  NULL, NULL,
-								  _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								  G_TYPE_NONE, 2,
-								  G_TYPE_BOOLEAN,
-								  G_TYPE_OBJECT);
-	daemon_signals[FOLDER_SUBSCRIBED_SIGNAL] = g_signal_new ("folder_subscribed",
-								 G_TYPE_FROM_CLASS (klass),
-								 (GSignalFlags) G_SIGNAL_RUN_LAST,
-								 G_STRUCT_OFFSET (SyncdaemonDaemonClass, folder_subscribed),
-								 NULL, NULL,
-								 _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								 G_TYPE_NONE, 2,
-								 G_TYPE_BOOLEAN,
-								 G_TYPE_OBJECT);
-	daemon_signals[FOLDER_UNSUBSCRIBED_SIGNAL] = g_signal_new ("folder_unsubscribed",
-								   G_TYPE_FROM_CLASS (klass),
-								   (GSignalFlags) G_SIGNAL_RUN_LAST,
-								   G_STRUCT_OFFSET (SyncdaemonDaemonClass, folder_unsubscribed),
-								   NULL, NULL,
-								   _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								   G_TYPE_NONE, 2,
-								   G_TYPE_BOOLEAN,
-								   G_TYPE_OBJECT);
-	daemon_signals[FILE_PUBLISHED_SIGNAL] = g_signal_new ("file_published",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, file_published),
-								  NULL, NULL,
-								  _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								  G_TYPE_NONE, 2,
-								  G_TYPE_BOOLEAN,
-								  G_TYPE_OBJECT);
-	daemon_signals[FILE_UNPUBLISHED_SIGNAL] = g_signal_new ("file_unpublished",
-								G_TYPE_FROM_CLASS (klass),
-								(GSignalFlags) G_SIGNAL_RUN_LAST,
-								G_STRUCT_OFFSET (SyncdaemonDaemonClass, file_unpublished),
-								NULL, NULL,
-								_syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								G_TYPE_NONE, 2,
-								G_TYPE_BOOLEAN,
-								G_TYPE_OBJECT);
-	daemon_signals[SHARE_CREATED_SIGNAL] = g_signal_new ("share_created",
-								 G_TYPE_FROM_CLASS (klass),
-								 (GSignalFlags) G_SIGNAL_RUN_LAST,
-								 G_STRUCT_OFFSET (SyncdaemonDaemonClass, share_created),
-								 NULL, NULL,
-								 _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								 G_TYPE_NONE, 2,
-								 G_TYPE_BOOLEAN,
-								 G_TYPE_OBJECT);
-	daemon_signals[SHARE_DELETED_SIGNAL] = g_signal_new ("share_deleted",
-								 G_TYPE_FROM_CLASS (klass),
-								 (GSignalFlags) G_SIGNAL_RUN_LAST,
-								 G_STRUCT_OFFSET (SyncdaemonDaemonClass, share_deleted),
-								 NULL, NULL,
-								 _syncdaemon_marshal_VOID__BOOLEAN_OBJECT,
-								 G_TYPE_NONE, 2,
-								 G_TYPE_BOOLEAN,
-								 G_TYPE_OBJECT);
-	daemon_signals[DOWNLOAD_STARTED_SIGNAL] = g_signal_new ("download_started",
-								G_TYPE_FROM_CLASS (klass),
-								(GSignalFlags) G_SIGNAL_RUN_LAST,
-								G_STRUCT_OFFSET (SyncdaemonDaemonClass, download_started),
-								NULL, NULL,
-								g_cclosure_marshal_VOID__STRING,
-								G_TYPE_NONE, 1,
-								G_TYPE_STRING);
-	daemon_signals[DOWNLOAD_FILE_PROGRESS_SIGNAL] = g_signal_new ("download_file_progress",
-									  G_TYPE_FROM_CLASS (klass),
-									  (GSignalFlags) G_SIGNAL_RUN_LAST,
-									  G_STRUCT_OFFSET (SyncdaemonDaemonClass, download_file_progress),
-									  NULL, NULL,
-									  _syncdaemon_marshal_VOID__STRING_OBJECT,
-									  G_TYPE_NONE, 2,
-									  G_TYPE_STRING, G_TYPE_OBJECT);
-	daemon_signals[DOWNLOAD_FINISHED_SIGNAL] = g_signal_new ("download_finished",
-								 G_TYPE_FROM_CLASS (klass),
-								 (GSignalFlags) G_SIGNAL_RUN_LAST,
-								 G_STRUCT_OFFSET (SyncdaemonDaemonClass, download_finished),
-								 NULL, NULL,
-								 _syncdaemon_marshal_VOID__STRING_OBJECT,
-								 G_TYPE_NONE, 2,
-								 G_TYPE_STRING, G_TYPE_OBJECT);
-	daemon_signals[UPLOAD_STARTED_SIGNAL] = g_signal_new ("upload_started",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, upload_started),
-								  NULL, NULL,
-								  g_cclosure_marshal_VOID__STRING,
-								  G_TYPE_NONE, 1,
-								  G_TYPE_STRING);
-	daemon_signals[UPLOAD_FILE_PROGRESS_SIGNAL] = g_signal_new ("upload_file_progress",
-									G_TYPE_FROM_CLASS (klass),
-									(GSignalFlags) G_SIGNAL_RUN_LAST,
-									G_STRUCT_OFFSET (SyncdaemonDaemonClass, upload_file_progress),
-									NULL, NULL,
-									_syncdaemon_marshal_VOID__STRING_OBJECT,
-									G_TYPE_NONE, 2,
-									G_TYPE_STRING, G_TYPE_OBJECT);
-	daemon_signals[UPLOAD_FINISHED_SIGNAL] = g_signal_new ("upload_finished",
-								   G_TYPE_FROM_CLASS (klass),
-								   (GSignalFlags) G_SIGNAL_RUN_LAST,
-								   G_STRUCT_OFFSET (SyncdaemonDaemonClass, upload_finished),
-								   NULL, NULL,
-								   _syncdaemon_marshal_VOID__STRING_OBJECT,
-								   G_TYPE_NONE, 2,
-								   G_TYPE_STRING, G_TYPE_OBJECT);
-	daemon_signals[QUOTA_EXCEEDED_SIGNAL] = g_signal_new ("quota_exceeded",
-								  G_TYPE_FROM_CLASS (klass),
-								  (GSignalFlags) G_SIGNAL_RUN_LAST,
-								  G_STRUCT_OFFSET (SyncdaemonDaemonClass, quota_exceeded),
-								  NULL, NULL,
-								  g_cclosure_marshal_VOID__POINTER,
-								  G_TYPE_NONE, 1,
-								  G_TYPE_POINTER);
-}
-
-static void
-quota_exceeded_cb (DBusGProxy *proxy, GHashTable *volume_info, gpointer user_data)
-{
-	SyncdaemonDaemon *daemon = SYNCDAEMON_DAEMON (user_data);
-
-	if (daemon != NULL)
-			g_signal_emit_by_name (daemon, "quota_exceeded", volume_info);
-}
-
-static gboolean
-ready_signal_idle_cb (gpointer user_data)
-{
-	SyncdaemonDaemon *daemon = SYNCDAEMON_DAEMON (user_data);
-
-	g_signal_emit (daemon, daemon_signals[READY_SIGNAL], 0);
-
-	return FALSE;
-}
-
-static void
-setup_daemon_interface (SyncdaemonDaemon *daemon)
-{
-	GObject *proxy = NULL;
-
-	if (daemon->priv->daemon_interface != NULL)
-		g_object_unref (daemon->priv->daemon_interface);
-	daemon->priv->daemon_interface = g_object_new (SYNCDAEMON_TYPE_INTERFACE,
-							   "daemon", daemon,
-							   NULL);
-	proxy = syncdaemon_interface_setup_proxy (SYNCDAEMON_INTERFACE (daemon->priv->daemon_interface),
-							  SYNCDAEMON_DBUS_NAME, "/",
-							  "com.ubuntuone.SyncDaemon.SyncDaemon");
-	if (proxy != NULL) {
-		daemon->priv->ready = TRUE;
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (proxy), "QuotaExceeded",
-					 dbus_g_type_get_map ("GHashTable",
-										  G_TYPE_STRING,
-										  G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (proxy), "QuotaExceeded",
-						 G_CALLBACK (quota_exceeded_cb),
-						 daemon, NULL);
-
-		/* Now get all the interfaces so that we get the signals from them */
-		syncdaemon_daemon_get_config_interface (daemon);
-		syncdaemon_daemon_get_events_interface (daemon);
-		syncdaemon_daemon_get_filesystem_interface (daemon);
-		syncdaemon_daemon_get_folders_interface (daemon);
-		syncdaemon_daemon_get_publicfiles_interface (daemon);
-		syncdaemon_daemon_get_shares_interface (daemon);
-		syncdaemon_daemon_get_status_interface (daemon);
-
-		/* Emit the signal in an idle callback so that callers get it when syncdaemon is running
-		   and hence signal is emitted in the _init method */
-		g_idle_add ((GSourceFunc) ready_signal_idle_cb, daemon);
-	}
-
-}
-
-static void
-name_owner_changed_cb (DBusGProxy *proxy,
-			   const char *name,
-			   const char *old_owner,
-			   const char *new_owner,
-			   gpointer user_data)
-{
-	SyncdaemonDaemon *daemon = SYNCDAEMON_DAEMON (user_data);
-
-	if (g_strcmp0 (name, SYNCDAEMON_DBUS_NAME) == 0) {
-		if (new_owner != NULL && strlen (new_owner) > 0) {
-			g_debug ("Got notification of SyncDaemon startup in NameOwnerChanged");
-			setup_daemon_interface (daemon);
-		} else {
-			daemon->priv->ready = FALSE;
-
-			g_debug ("Syncdaemon service died");
-			if (daemon->priv->daemon_interface != NULL) {
-				g_object_unref (daemon->priv->daemon_interface);
-				daemon->priv->daemon_interface = NULL;
-			}
-
-			g_hash_table_remove_all (daemon->priv->subinterfaces);
-			daemon->priv->connected = FALSE;
-		}
-	}
-}
-
-static void
-syncdaemon_daemon_init (SyncdaemonDaemon *daemon)
-{
-	gboolean has_owner;
-	GError *error = NULL;
-
-	daemon->priv = g_new0 (SyncdaemonDaemonPrivate, 1);
-
-	daemon->priv->ready = FALSE;
-	daemon->priv->connected = FALSE;
-	daemon->priv->subinterfaces = g_hash_table_new_full (g_str_hash, g_str_equal,
-								 g_free, g_object_unref);
-	daemon->priv->auth = g_object_new (SYNCDAEMON_TYPE_AUTHENTICATION, NULL);
-
-	/* Initialize DBus */
-#ifdef HAVE_GDBUS
-	daemon->priv->bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-#else
-	daemon->priv->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-#endif
-	if (error != NULL) {
-		g_warning ("Couldn't get session bus: %s", error->message);
-		g_error_free (error);
-		return;
-	}
-
-	daemon->priv->dbus_proxy = dbus_g_proxy_new_for_name (daemon->priv->bus,
-									  "org.freedesktop.DBus",
-									  "/org/freedesktop/DBus",
-									  "org.freedesktop.DBus");
-
-	/* Check if syncdaemon is running */
-	error = NULL;
-	if (org_freedesktop_DBus_name_has_owner (daemon->priv->dbus_proxy, SYNCDAEMON_DBUS_NAME, &has_owner, &error)) {
-		if (has_owner) {
-			/* Already running, so initialize ourselves */
-			g_debug ("SyncDaemon already running, initializing SyncdaemonDaemon object");
-			setup_daemon_interface (daemon);
-		} else
-			g_debug ("Syncdaemon not running, waiting for it to start in NameOwnerChanged");
-	} else {
-		/* The DBus call failed, so just wait for SyncDaemon to start in name_owner_changed_cb */
-		g_warning ("Error calling NameHasOwner: %s", error->message);
-		g_error_free (error);
-	}
-
-	/* Listen to DBus for syncdaemon restarts */
-	dbus_g_proxy_add_signal (DBUS_G_PROXY (daemon->priv->dbus_proxy), "NameOwnerChanged",
-				 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-				 G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (DBUS_G_PROXY (daemon->priv->dbus_proxy),
-					 "NameOwnerChanged",
-					 G_CALLBACK (name_owner_changed_cb),
-					 daemon, NULL);
-}
-
-/**
- * syncdaemon_daemon_new:
- *
- * Create a new #SyncdaemonDaemon object, which provides access to the
- * Syncdaemon daemon.
- *
- * Return value: A new #SyncdaemonDaemon object.
- */
-SyncdaemonDaemon *
-syncdaemon_daemon_new (void)
-{
-	return g_object_new (SYNCDAEMON_TYPE_DAEMON, NULL);
-}
-
-/**
- * syncdaemon_daemon_is_ready:
- */
-gboolean
-syncdaemon_daemon_is_ready (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	return daemon->priv->ready;
-}
-
-static void
-connect_response_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GError *error = NULL;
-	SyncdaemonDaemon *daemon = (SyncdaemonDaemon *) user_data;
-
-	if (dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
-		daemon->priv->connected = TRUE;
-		g_signal_emit (daemon, daemon_signals[CONNECTED_SIGNAL], 0);
-	} else {
-		g_warning ("Syncdaemon cannot connect: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * syncdaemon_daemon_connect:
- */
-gboolean
-syncdaemon_daemon_connect (SyncdaemonDaemon *daemon)
-{
-	GObject *proxy;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	proxy = syncdaemon_interface_get_proxy_object (SYNCDAEMON_INTERFACE (daemon->priv->daemon_interface));
-	if (proxy != NULL) {
-#ifdef HAVE_GDBUS
-#else
-		if (!dbus_g_proxy_begin_call (DBUS_G_PROXY (proxy), "connect",
-						  connect_response_cb, daemon, NULL,
-						  G_TYPE_INVALID)) {
-			g_warning ("Call to 'connect' method failed");
-
-			return FALSE;
-		}
-#endif
-	}
-
-	return TRUE;
-}
-
-static void
-disconnect_response_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GError *error = NULL;
-	SyncdaemonDaemon *daemon = (SyncdaemonDaemon *) user_data;
-
-	if (dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) {
-		daemon->priv->connected = FALSE;
-		g_signal_emit (daemon, daemon_signals[DISCONNECTED_SIGNAL], 0);
-	} else {
-		g_warning ("Syncdaemon cannot disconnect: %s", error->message);
-		g_error_free (error);
-	}
-}
-
-/**
- * syncdaemon_daemon_interface_disconnect:
- */
-gboolean
-syncdaemon_daemon_disconnect (SyncdaemonDaemon *daemon)
-{
-	GObject *proxy;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	proxy = syncdaemon_interface_get_proxy_object (SYNCDAEMON_INTERFACE (daemon->priv->daemon_interface));
-	if (proxy != NULL) {
-#ifdef HAVE_GDBUS
-#else
-		if (!dbus_g_proxy_begin_call (DBUS_G_PROXY (proxy), "disconnect",
-						  disconnect_response_cb, daemon, NULL,
-						  G_TYPE_INVALID)) {
-			g_warning ("Call to 'disconnect' method failed");
-
-			return FALSE;
-		}
-#endif
-	}
-
-	return TRUE;
-}
-
-/**
- * syncdaemon_daemon_interface_quit:
- */
-gboolean
-syncdaemon_daemon_quit (SyncdaemonDaemon *daemon)
-{
-	GObject *proxy;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	proxy = syncdaemon_interface_get_proxy_object (SYNCDAEMON_INTERFACE (daemon->priv->daemon_interface));
-	if (proxy != NULL) {
-		GError *error = NULL;
-
-#ifdef HAVE_GDBUS
-#else
-		if (!dbus_g_proxy_call (DBUS_G_PROXY (proxy), "quit", &error,
-					G_TYPE_INVALID,
-					G_TYPE_INVALID)) {
-			g_warning ("Could not quit syncdaemon: %s", error->message);
-			g_error_free (error);
-
-			return FALSE;
-		}
-#endif
-	}
-
-	return TRUE;
-}
-
-/**
- * syncdaemon_daemon_get_root_dir:
- */
-const gchar *
-syncdaemon_daemon_get_root_dir (SyncdaemonDaemon *daemon)
-{
-	GObject *proxy;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	if (daemon->priv->root_dir != NULL)
-		return (const gchar *) daemon->priv->root_dir;
-
-	proxy = syncdaemon_interface_get_proxy_object (SYNCDAEMON_INTERFACE (daemon->priv->daemon_interface));
-	if (proxy != NULL) {
-		gchar *new_root_dir;
-		GError *error = NULL;
-
-#ifdef HAVE_GDBUS
-#else
-		if (!dbus_g_proxy_call (DBUS_G_PROXY (proxy), "get_rootdir", &error,
-					G_TYPE_INVALID,
-					G_TYPE_STRING, &new_root_dir,
-					G_TYPE_INVALID)) {
-			g_warning ("Could not get syncdaemon's root dir: %s", error->message);
-			g_error_free (error);
-
-			return NULL;
-		}
-#endif
-
-		daemon->priv->root_dir = new_root_dir;
-
-		return (const gchar *) daemon->priv->root_dir;
-	}
-
-	return NULL;
-}
-
-/**
- * syncdaemon_daemon_has_network:
- */
-gboolean
-syncdaemon_daemon_has_network (SyncdaemonDaemon *daemon)
-{
-	SyncdaemonInterface *interface;
-	gboolean result = FALSE;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	interface = syncdaemon_daemon_get_status_interface (daemon);
-	if (SYNCDAEMON_IS_STATUS_INTERFACE (interface)) {
-		SyncdaemonStatusInfo *status_info;
-
-		status_info = syncdaemon_status_interface_get_current_status (SYNCDAEMON_STATUS_INTERFACE (interface));
-		if (g_strrstr (syncdaemon_status_info_get_connection (status_info), "With Network") != NULL)
-			result = TRUE;
-
-		g_object_unref (G_OBJECT (status_info));
-	}
-
-	return result;
-}
-
-/**
- * syncdaemon_daemon_get_authentication:
- */
-SyncdaemonAuthentication *
-syncdaemon_daemon_get_authentication (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return daemon->priv->auth;
-}
-
-/**
- * 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
- * @is_root: Placeholder for returning whether the given path is a U1 root folder
- *
- * Check whether a given path is a folder enabled for synchronization to U1.
- *
- * Return value: TRUE if the folder is enabled, FALSE otherwise.
- */
-gboolean
-syncdaemon_daemon_is_folder_enabled (SyncdaemonDaemon *daemon, const gchar *path, gboolean *is_root)
-{
-	const gchar *root;
-	gchar *root_with_slash;
-	gboolean managed = FALSE, is_subscribed = FALSE;
-	gchar *dirpath;
-	SyncdaemonInterface *interface;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-	g_return_val_if_fail (path != NULL, FALSE);
-
-	*is_root = FALSE;
-
-	/* First check the root folder */
-	root = syncdaemon_daemon_get_root_dir (daemon);
-	if (g_strcmp0 (path, root) == 0) {
-		*is_root = TRUE;
-		return TRUE;
-	} else {
-		root_with_slash = g_build_filename (root,  G_DIR_SEPARATOR_S, NULL);
-
-		if (g_str_has_prefix (path, root_with_slash)) {
-			g_free(root_with_slash); 
-			return TRUE;
-		}
-		g_free(root_with_slash); 
-	}
-	/* Now check the 'Shared With Me' directory */
-	dirpath = g_build_filename (root, "Shared With Me", NULL);
-	if (g_strcmp0 (path, dirpath) == 0) {
-		g_free (dirpath);
-		return FALSE;
-	}
-	g_free (dirpath);
-
-	/* And finally check UDFs */
-	interface = syncdaemon_daemon_get_folders_interface (daemon);
-	if (SYNCDAEMON_IS_FOLDERS_INTERFACE (interface)) {
-		GSList *udfs, *l;
-
-		udfs = syncdaemon_folders_interface_get_folders (SYNCDAEMON_FOLDERS_INTERFACE (interface));
-		for (l = udfs; l != NULL; l = l->next) {
-			const gchar *tmp_path;
-			gchar *tmp_path_with_slash;
-			SyncdaemonFolderInfo *finfo = SYNCDAEMON_FOLDER_INFO (l->data);
-
-			tmp_path = syncdaemon_folder_info_get_path (finfo);
-			is_subscribed = syncdaemon_folder_info_get_subscribed (finfo);
-
-			tmp_path_with_slash = g_strconcat (tmp_path, G_DIR_SEPARATOR_S, NULL);
-			if (g_strcmp0 (path, tmp_path) == 0) {
-				managed = is_subscribed;
-				*is_root = TRUE;
-				break;
-			} else if (g_str_has_prefix (path, tmp_path_with_slash)) {
-				managed = is_subscribed;
-				break;
-			}
-			g_free (tmp_path_with_slash);
-		}
-
-		g_slist_free (udfs);
-	}
-
-	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_publish_file:
- * @daemon: A #SyncdaemonDaemon object
- * @path: Full path of the file to be published
- *
- * Publish a file on Ubuntu One. When the file is successfully published, the "file_published"
- * signal will be emitted.
- *
- * Return value: TRUE if successful, FALSE otherwise.
- */
-gboolean
-syncdaemon_daemon_publish_file (SyncdaemonDaemon *daemon, const gchar *path)
-{
-	SyncdaemonMetadata *metadata;
-	gboolean result = FALSE;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	/* First, retrieve the metadata */
-	metadata = syncdaemon_daemon_get_metadata (daemon, path, FALSE);
-	if (metadata != NULL) {
-		SyncdaemonInterface *interface;
-
-		interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
-		syncdaemon_publicfiles_interface_change_public_access (
-			SYNCDAEMON_PUBLICFILES_INTERFACE (interface),
-			syncdaemon_metadata_get_share_id (metadata),
-			syncdaemon_metadata_get_node_id (metadata),
-			TRUE);
-
-		result = TRUE;
-
-		g_object_unref (metadata);
-	}
-
-	return result;
-}
-
-/**
- * syncdaemon_daemon_unpublish_file:
- * @daemon: A #SyncdaemonDaemon object
- * @path: Full path of the file to be unpublished
- *
- * Unpublish a file from Ubuntu One. When the file is successfully unpublished, the "file_unpublished"
- * signal will be emitted.
- *
- * Return value: TRUE if successful, FALSE otherwise.
- */
-gboolean
-syncdaemon_daemon_unpublish_file (SyncdaemonDaemon *daemon, const gchar *path)
-{
-	SyncdaemonMetadata *metadata;
-	gboolean result = FALSE;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), FALSE);
-
-	/* First, retrieve the metadata */
-	metadata = syncdaemon_daemon_get_metadata (daemon, path, FALSE);
-	if (metadata != NULL) {
-		SyncdaemonInterface *interface;
-
-		interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
-		syncdaemon_publicfiles_interface_change_public_access (
-			SYNCDAEMON_PUBLICFILES_INTERFACE (interface),
-			syncdaemon_metadata_get_share_id (metadata),
-			syncdaemon_metadata_get_node_id (metadata),
-			FALSE);
-
-		result = TRUE;
-
-		g_object_unref (metadata);
-	}
-
-	return result;
-}
-
-/**
- * syncdaemon_daemon_get_public_files:
- * @daemon: A #SyncdaemonDaemon object
- *
- * Retrieve the list of public files.
- *
- * Return value: A #GSList of #SyncdaemonFileInfo objects, each of which describes
- * a published file for the user. When no longer needed, this list should be
- * freed by calling g_slist_free, but the data within the list should never
- * be freed, as it belongs to the library.
- */
-GSList *
-syncdaemon_daemon_get_public_files (SyncdaemonDaemon *daemon)
-{
-	SyncdaemonInterface *interface;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	interface = syncdaemon_daemon_get_publicfiles_interface (daemon);
-	if (interface != NULL) {
-		return syncdaemon_publicfiles_interface_get_public_files (
-			SYNCDAEMON_PUBLICFILES_INTERFACE (interface));
-	}
-
-	return 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 *
-get_interface (SyncdaemonDaemon *daemon, const gchar *path, SDINewFunc new_func)
-{
-	SyncdaemonInterface *interface;
-
-	interface = g_hash_table_lookup (daemon->priv->subinterfaces, path);
-	if (interface == NULL) {
-		interface = new_func (daemon);
-		if (SYNCDAEMON_IS_INTERFACE (interface))
-			g_hash_table_insert (daemon->priv->subinterfaces, g_strdup (path), interface);
-	}
-
-	return interface;
-}
-
-/**
- * syncdaemon_daemon_get_config_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_config_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/config",
-			      (SDINewFunc) syncdaemon_config_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_events_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_events_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/events",
-			      (SDINewFunc) syncdaemon_events_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_filesystem_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_filesystem_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/filesystem",
-			      (SDINewFunc) syncdaemon_filesystem_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_folders_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_folders_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/folders",
-			      (SDINewFunc) syncdaemon_folders_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_publicfiles_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_publicfiles_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/publicfiles",
-			      (SDINewFunc) syncdaemon_publicfiles_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_shares_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_shares_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/shares",
-			      (SDINewFunc) syncdaemon_shares_interface_new);
-}
-
-/**
- * syncdaemon_daemon_get_status_interface:
- */
-SyncdaemonInterface *
-syncdaemon_daemon_get_status_interface (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return get_interface (daemon, "/status",
-			      (SDINewFunc) syncdaemon_status_interface_new);
-}

=== removed file 'libsyncdaemon/syncdaemon-daemon.h'
--- libsyncdaemon/syncdaemon-daemon.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-daemon.h	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_DAEMON_H__
-#define __SYNCDAEMON_DAEMON_H__
-
-#include <glib-object.h>
-#include "syncdaemon-authentication.h"
-#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"
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_DAEMON                (syncdaemon_daemon_get_type ())
-#define SYNCDAEMON_DAEMON(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_DAEMON, SyncdaemonDaemon))
-#define SYNCDAEMON_IS_DAEMON(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_DAEMON))
-#define SYNCDAEMON_DAEMON_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_DAEMON, SyncdaemonDaemonClass))
-#define SYNCDAEMON_IS_DAEMON_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_DAEMON))
-#define SYNCDAEMON_DAEMON_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_DAEMON, SyncdaemonDaemonClass))
-
-typedef struct _SyncdaemonDaemonPrivate SyncdaemonDaemonPrivate;
-
-typedef struct {
-	GObject parent;
-	SyncdaemonDaemonPrivate *priv;
-} SyncdaemonDaemon;
-
-typedef struct {
-	GObjectClass parent_class;
-
-	/* Signals */
-	void (* ready) (SyncdaemonDaemon *daemon);
-
-	void (* connected) (SyncdaemonDaemon *daemon);
-	void (* disconnected) (SyncdaemonDaemon *daemon);
-	void (* status_changed) (SyncdaemonDaemon *daemon, SyncdaemonStatusInfo *status_info);
-
-	void (* event) (SyncdaemonDaemon *daemon, GHashTable *event_dict);
-	void (* error) (SyncdaemonDaemon *daemon, const gchar *signal, GHashTable *extra_args);
-
-	void (* folder_created) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFolderInfo *folder_info);
-	void (* folder_deleted) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFolderInfo *folder_info);
-	void (* folder_subscribed) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFolderInfo *folder_info);
-	void (* folder_unsubscribed) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFolderInfo *folder_info);
-
-	void (* file_published) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFileInfo *file_info);
-	void (* file_unpublished) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonFileInfo *file_info);
-
-	void (* share_created) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
-	void (* share_deleted) (SyncdaemonDaemon *daemon, gboolean success, SyncdaemonShareInfo *share_info);
-
-	void (* download_started) (SyncdaemonDaemon *daemon, const gchar *path);
-	void (* download_file_progress) (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonTransferInfo *tinfo);
-	void (* download_finished) (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonTransferInfo *tinfo);
-	void (* upload_started) (SyncdaemonDaemon *daemon, const gchar *path);
-	void (* upload_file_progress) (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonTransferInfo *tinfo);
-	void (* upload_finished) (SyncdaemonDaemon *daemon, const gchar *path, SyncdaemonTransferInfo *tinfo);
-
-	void (* quota_exceeded) (SyncdaemonDaemon *daemon, GHashTable *volume_info);
-} SyncdaemonDaemonClass;
-
-GType                syncdaemon_daemon_get_type (void);
-
-SyncdaemonDaemon    *syncdaemon_daemon_new (void);
-
-gboolean             syncdaemon_daemon_is_ready (SyncdaemonDaemon *daemon);
-
-gboolean             syncdaemon_daemon_connect (SyncdaemonDaemon *daemon);
-gboolean             syncdaemon_daemon_disconnect (SyncdaemonDaemon *daemon);
-gboolean             syncdaemon_daemon_quit (SyncdaemonDaemon *daemon);
-const gchar         *syncdaemon_daemon_get_root_dir (SyncdaemonDaemon *daemon);
-
-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 */
-gboolean             syncdaemon_daemon_publish_file (SyncdaemonDaemon *daemon, const gchar *path);
-gboolean             syncdaemon_daemon_unpublish_file (SyncdaemonDaemon *daemon, const gchar *path);
-GSList              *syncdaemon_daemon_get_public_files (SyncdaemonDaemon *daemon);
-
-/* 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
- */
-SyncdaemonInterface *syncdaemon_daemon_get_config_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_events_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_filesystem_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_folders_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_publicfiles_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_shares_interface (SyncdaemonDaemon *daemon);
-SyncdaemonInterface *syncdaemon_daemon_get_status_interface (SyncdaemonDaemon *daemon);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-events-interface.c'
--- libsyncdaemon/syncdaemon-events-interface.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-events-interface.c	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#ifdef HAVE_GDBUS
-#else
-#include <dbus/dbus-glib.h>
-#endif
-#include "syncdaemon-events-interface.h"
-
-G_DEFINE_TYPE(SyncdaemonEventsInterface, syncdaemon_events_interface, SYNCDAEMON_TYPE_INTERFACE)
-
-struct _SyncdaemonEventsInterfacePrivate {
-	GObject *proxy;
-};
-
-static void
-syncdaemon_events_interface_finalize (GObject *object)
-{
-	SyncdaemonEventsInterface *interface = SYNCDAEMON_EVENTS_INTERFACE (object);
-
-	if (interface->priv != NULL) {
-		g_free (interface->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_events_interface_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_events_interface_class_init (SyncdaemonEventsInterfaceClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_events_interface_finalize;
-}
-
-static void
-event_cb (DBusGProxy *proxy, GHashTable *event_dict, gpointer user_data)
-{
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonEventsInterface *interface = SYNCDAEMON_EVENTS_INTERFACE (user_data);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "event", event_dict);
-}
-
-static void
-syncdaemon_events_interface_init (SyncdaemonEventsInterface *interface)
-{
-	interface->priv = g_new0 (SyncdaemonEventsInterfacePrivate, 1);
-
-	/* Setup DBus proxy */
-	interface->priv->proxy = syncdaemon_interface_setup_proxy (SYNCDAEMON_INTERFACE (interface),
-								   "com.ubuntuone.SyncDaemon",
-								   "/events", "com.ubuntuone.SyncDaemon.Events");
-	if (interface->priv->proxy != NULL) {
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "Event",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "Event",
-					     G_CALLBACK (event_cb), interface, NULL);
-	}
-}
-
-/**
- * syncdaemon_events_interface_new:
- */
-SyncdaemonEventsInterface *
-syncdaemon_events_interface_new (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return g_object_new (SYNCDAEMON_TYPE_EVENTS_INTERFACE, "daemon", daemon, NULL);
-}
-
-/**
- * syncdaemon_events_interface_push_event:
- */
-void
-syncdaemon_events_interface_push_event (SyncdaemonEventsInterface *interface,
-					const gchar *event_name,
-					const gchar **args)
-{
-	GError *error = NULL;
-
-	g_return_if_fail (SYNCDAEMON_IS_EVENTS_INTERFACE (interface));
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), "push_event", &error,
-				G_TYPE_STRING, event_name,
-				G_TYPE_STRV, args,
-				G_TYPE_INVALID,
-				G_TYPE_INVALID)) {
-		g_warning ("Failed calling push_event: %s", error->message);
-		g_error_free (error);
-	}
-}

=== removed file 'libsyncdaemon/syncdaemon-events-interface.h'
--- libsyncdaemon/syncdaemon-events-interface.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-events-interface.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_EVENTS_INTERFACE_H__
-#define __SYNCDAEMON_EVENTS_INTERFACE_H__
-
-#include "syncdaemon-daemon.h"
-#include "syncdaemon-interface.h"
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_EVENTS_INTERFACE                (syncdaemon_events_interface_get_type ())
-#define SYNCDAEMON_EVENTS_INTERFACE(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_EVENTS_INTERFACE, SyncdaemonEventsInterface))
-#define SYNCDAEMON_IS_EVENTS_INTERFACE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_EVENTS_INTERFACE))
-#define SYNCDAEMON_EVENTS_INTERFACE_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_EVENTS_INTERFACE, SyncdaemonEventsInterfaceClass))
-#define SYNCDAEMON_IS_EVENTS_INTERFACE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_EVENTS_INTERFACE))
-#define SYNCDAEMON_EVENTS_INTERFACE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_EVENTS_INTERFACE, SyncdaemonEventsInterfaceClass))
-
-typedef struct _SyncdaemonEventsInterfacePrivate SyncdaemonEventsInterfacePrivate;
-
-typedef struct {
-	SyncdaemonInterface parent;
-	SyncdaemonEventsInterfacePrivate *priv;
-} SyncdaemonEventsInterface;
-
-typedef struct {
-	SyncdaemonInterfaceClass parent_class;
-} SyncdaemonEventsInterfaceClass;
-
-GType                      syncdaemon_events_interface_get_type (void);
-
-SyncdaemonEventsInterface *syncdaemon_events_interface_new (SyncdaemonDaemon *daemon);
-
-void                       syncdaemon_events_interface_push_event (SyncdaemonEventsInterface *interface,
-								   const gchar *event_name,
-								   const gchar **args);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-file-info.c'
--- libsyncdaemon/syncdaemon-file-info.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-file-info.c	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "syncdaemon-file-info.h"
-
-G_DEFINE_TYPE(SyncdaemonFileInfo, syncdaemon_file_info, G_TYPE_OBJECT)
-
-struct _SyncdaemonFileInfoPrivate {
-	gchar *volume_id;
-	gchar *node_id;
-	gchar *public_url;
-	gchar *path;
-	gboolean is_public;
-};
-
-static void
-syncdaemon_file_info_finalize (GObject *object)
-{
-	SyncdaemonFileInfo *finfo = SYNCDAEMON_FILE_INFO (object);
-
-	if (finfo->priv != NULL) {
-		if (finfo->priv->volume_id != NULL)
-			g_free (finfo->priv->volume_id);
-
-		if (finfo->priv->node_id != NULL)
-			g_free (finfo->priv->node_id);
-
-		if (finfo->priv->public_url != NULL)
-			g_free (finfo->priv->public_url);
-
-		if (finfo->priv->path != NULL)
-			g_free (finfo->priv->path);
-
-		g_free (finfo->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_file_info_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_file_info_class_init (SyncdaemonFileInfoClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_file_info_finalize;
-}
-
-static void
-syncdaemon_file_info_init (SyncdaemonFileInfo *finfo)
-{
-	finfo->priv = g_new0 (SyncdaemonFileInfoPrivate, 1);
-}
-
-/**
- * syncdaemon_file_info_new:
- */
-SyncdaemonFileInfo *
-syncdaemon_file_info_new (void)
-{
-	return g_object_new (SYNCDAEMON_TYPE_FILE_INFO, NULL);
-}
-
-/**
- * syncdaemon_file_info_new_from_hash_table:
- */
-SyncdaemonFileInfo *
-syncdaemon_file_info_new_from_hash_table (GHashTable *hash)
-{
-	SyncdaemonFileInfo *finfo;
-
-	finfo = g_object_new (SYNCDAEMON_TYPE_FILE_INFO, NULL);
-	if (hash != NULL) {
-		syncdaemon_file_info_set_volume_id (finfo, g_hash_table_lookup (hash, "volume_id"));
-		syncdaemon_file_info_set_node_id (finfo, g_hash_table_lookup (hash, "node_id"));
-		syncdaemon_file_info_set_public_url (finfo, g_hash_table_lookup (hash, "public_url"));
-		syncdaemon_file_info_set_path (finfo, g_hash_table_lookup (hash, "path"));
-		syncdaemon_file_info_set_is_public (
-			finfo,
-			g_strcmp0 (g_hash_table_lookup (hash, "is_public"), "True") == 0);			    
-	}
-
-	return finfo;
-}
-
-/**
- * syncdaemon_file_info_get_volume_id:
- */
-const gchar *
-syncdaemon_file_info_get_volume_id (SyncdaemonFileInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->volume_id;
-}
-
-/**
- * syncdaemon_file_info_set_volume_id:
- */
-void
-syncdaemon_file_info_set_volume_id (SyncdaemonFileInfo *finfo, const gchar *volume_id)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo));
-
-	if (finfo->priv->volume_id != NULL)
-		g_free (finfo->priv->volume_id);
-
-	finfo->priv->volume_id = g_strdup (volume_id);
-}
-
-/**
- * syncdaemon_file_info_get_node_id:
- */
-const gchar *
-syncdaemon_file_info_get_node_id (SyncdaemonFileInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->node_id;
-}
-
-/**
- * syncdaemon_file_info_set_node_id:
- */
-void
-syncdaemon_file_info_set_node_id (SyncdaemonFileInfo *finfo, const gchar *node_id)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo));
-
-	if (finfo->priv->node_id != NULL)
-		g_free (finfo->priv->node_id);
-
-	finfo->priv->node_id = g_strdup (node_id);
-}
-
-/**
- * syncdaemon_file_info_get_public_url:
- */
-const gchar *
-syncdaemon_file_info_get_public_url (SyncdaemonFileInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->public_url;
-}
-
-/**
- * syncdaemon_file_info_set_public_url:
- */
-void
-syncdaemon_file_info_set_public_url (SyncdaemonFileInfo *finfo, const gchar *public_url)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo));
-
-	if (finfo->priv->public_url != NULL)
-		g_free (finfo->priv->public_url);
-
-	finfo->priv->public_url = g_strdup (public_url);
-}
-
-/**
- * syncdaemon_file_info_get_path:
- */
-const gchar *
-syncdaemon_file_info_get_path (SyncdaemonFileInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->path;
-}
-
-/**
- * syncdaemon_file_info_set_path:
- */
-void
-syncdaemon_file_info_set_path (SyncdaemonFileInfo *finfo, const gchar *path)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo));
-
-	if (finfo->priv->path != NULL)
-		g_free (finfo->priv->path);
-
-	finfo->priv->path = g_strdup (path);
-}
-
-/**
- * syncdaemon_file_info_get_is_public:
- */
-gboolean
-syncdaemon_file_info_get_is_public (SyncdaemonFileInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo), FALSE);
-
-	return finfo->priv->is_public;
-}
-
-/**
- * syncdaemon_file_info_set_is_public:
- */
-void
-syncdaemon_file_info_set_is_public (SyncdaemonFileInfo *finfo, gboolean is_public)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FILE_INFO (finfo));
-
-	finfo->priv->is_public = is_public;
-}

=== removed file 'libsyncdaemon/syncdaemon-file-info.h'
--- libsyncdaemon/syncdaemon-file-info.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-file-info.h	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_FILE_INFO_H__
-#define __SYNCDAEMON_FILE_INFO_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_FILE_INFO                (syncdaemon_file_info_get_type ())
-#define SYNCDAEMON_FILE_INFO(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_FILE_INFO, SyncdaemonFileInfo))
-#define SYNCDAEMON_IS_FILE_INFO(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_FILE_INFO))
-#define SYNCDAEMON_FILE_INFO_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_FILE_INFO, SyncdaemonFileInfoClass))
-#define SYNCDAEMON_IS_FILE_INFO_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_FILE_INFO))
-#define SYNCDAEMON_FILE_INFO_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_FILE_INFO, SyncdaemonFileInfoClass))
-
-typedef struct _SyncdaemonFileInfoPrivate SyncdaemonFileInfoPrivate;
-
-typedef struct {
-	GObject parent;
-	SyncdaemonFileInfoPrivate *priv;
-} SyncdaemonFileInfo;
-
-typedef struct {
-	GObjectClass parent_class;
-} SyncdaemonFileInfoClass;
-
-GType               syncdaemon_file_info_get_type (void);
-SyncdaemonFileInfo *syncdaemon_file_info_new (void);
-SyncdaemonFileInfo *syncdaemon_file_info_new_from_hash_table (GHashTable *hash);
-
-const gchar        *syncdaemon_file_info_get_volume_id (SyncdaemonFileInfo *finfo);
-void                syncdaemon_file_info_set_volume_id (SyncdaemonFileInfo *finfo, const gchar *volume_id);
-const gchar        *syncdaemon_file_info_get_node_id (SyncdaemonFileInfo *finfo);
-void                syncdaemon_file_info_set_node_id (SyncdaemonFileInfo *finfo, const gchar *node_id);
-const gchar        *syncdaemon_file_info_get_path (SyncdaemonFileInfo *finfo);
-void                syncdaemon_file_info_set_path (SyncdaemonFileInfo *finfo, const gchar *path);
-
-gboolean            syncdaemon_file_info_get_is_public (SyncdaemonFileInfo *finfo);
-void                syncdaemon_file_info_set_is_public (SyncdaemonFileInfo *finfo, gboolean is_public);
-const gchar        *syncdaemon_file_info_get_public_url (SyncdaemonFileInfo *finfo);
-void                syncdaemon_file_info_set_public_url (SyncdaemonFileInfo *finfo, const gchar *public_url);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-filesystem-interface.c'
--- libsyncdaemon/syncdaemon-filesystem-interface.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-filesystem-interface.c	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#ifdef HAVE_GDBUS
-#else
-#include <dbus/dbus-glib.h>
-#endif
-#include "syncdaemon-filesystem-interface.h"
-
-G_DEFINE_TYPE(SyncdaemonFilesystemInterface, syncdaemon_filesystem_interface, SYNCDAEMON_TYPE_INTERFACE)
-
-struct _SyncdaemonFilesystemInterfacePrivate {
-	GObject *proxy;
-};
-
-static void
-syncdaemon_filesystem_interface_finalize (GObject *object)
-{
-	SyncdaemonFilesystemInterface *interface = SYNCDAEMON_FILESYSTEM_INTERFACE (object);
-
-	if (interface->priv != NULL) {
-		g_free (interface->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_filesystem_interface_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_filesystem_interface_class_init (SyncdaemonFilesystemInterfaceClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_filesystem_interface_finalize;
-}
-
-static void
-syncdaemon_filesystem_interface_init (SyncdaemonFilesystemInterface *interface)
-{
-	interface->priv = g_new0 (SyncdaemonFilesystemInterfacePrivate, 1);
-
-	/* Setup DBus proxy */
-	interface->priv->proxy = syncdaemon_interface_setup_proxy (SYNCDAEMON_INTERFACE (interface),
-								   "com.ubuntuone.SyncDaemon",
-								   "/filesystem", "com.ubuntuone.SyncDaemon.FileSystem");
-}
-
-/**
- * syncdaemon_filesystem_interface_new:
- */
-SyncdaemonFilesystemInterface *
-syncdaemon_filesystem_interface_new (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return g_object_new (SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE, "daemon", daemon, NULL);
-}
-
-/**
- * syncdaemon_filesystem_interface_get_metadata:
- */
-SyncdaemonMetadata *
-syncdaemon_filesystem_interface_get_metadata (SyncdaemonFilesystemInterface *interface,
-					      const gchar *path,
-                                              gboolean with_subtree_sync_check)
-{
-	GError *error = NULL;
-	GHashTable *hash;
-        const char *method;
-
-	g_return_val_if_fail (SYNCDAEMON_IS_FILESYSTEM_INTERFACE (interface), NULL);
-
-        if (with_subtree_sync_check)
-                method = "get_metadata_and_quick_tree_synced";
-        else
-                method = "get_metadata";
-
-	if (!dbus_g_proxy_call (DBUS_G_PROXY (interface->priv->proxy), method, &error,
-			       G_TYPE_STRING, path,
-			       G_TYPE_INVALID,
-			       dbus_g_type_get_map ("GHashTable",
-						    G_TYPE_STRING,
-						    G_TYPE_STRING), &hash,
-			       G_TYPE_INVALID)) {
-		g_warning ("Failed calling %s: %s", method, error->message);
-		g_error_free (error);
-
-		return NULL;
-	}
-
-	return syncdaemon_metadata_new_from_hash_table (hash);
-}
-
-typedef struct {
-	SyncdaemonFilesystemInterface *interface;
-	SyncdaemonGotMetadataFunc callback;
-	gpointer user_data;
-} GotMetadataData;
-
-static void
-got_metadata_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
-{
-	GHashTable *hash;
-	GError *error = NULL;
-	GotMetadataData *gmd = (GotMetadataData *) user_data;
-
-	if (dbus_g_proxy_end_call (proxy, call_id, &error,
-				   dbus_g_type_get_map ("GHashTable",
-							G_TYPE_STRING,
-							G_TYPE_STRING), &hash,
-				   G_TYPE_INVALID)) {
-		SyncdaemonMetadata *metadata;
-
-		metadata = syncdaemon_metadata_new_from_hash_table (hash);
-		gmd->callback (gmd->interface, TRUE, metadata, gmd->user_data);
-
-		/* Free memory */
-		g_object_unref (G_OBJECT (metadata));
-		g_hash_table_destroy (hash);
-	} else {
-		g_warning ("Error getting metadata: %s", error->message);
-		g_error_free (error);
-		gmd->callback (gmd->interface, FALSE, NULL, gmd->user_data);
-	}
-
-	g_free (gmd);
-}
-
-/**
- * syncdaemon_filesystem_interface_get_metadata_async:
- */
-void
-syncdaemon_filesystem_interface_get_metadata_async (SyncdaemonFilesystemInterface *interface,
-						    const gchar *path,
-                                                    gboolean with_subtree_sync_check,
-						    SyncdaemonGotMetadataFunc callback,
-						    gpointer user_data)
-{
-	GotMetadataData *gmd;
-        const gchar *method;
-
-	g_return_if_fail (SYNCDAEMON_IS_FILESYSTEM_INTERFACE (interface));
-
-        if (with_subtree_sync_check)
-                method = "get_metadata_and_quick_tree_synced";
-        else
-                method = "get_metadata";
-
-	gmd = g_new0 (GotMetadataData, 1);
-	gmd->interface = interface;
-	gmd->callback = callback;
-	gmd->user_data = user_data;
-
-	dbus_g_proxy_begin_call (DBUS_G_PROXY (interface->priv->proxy),
-                                 method,
-				 got_metadata_cb, gmd, NULL,
-				 G_TYPE_STRING, path,
-				 G_TYPE_INVALID);
-}

=== removed file 'libsyncdaemon/syncdaemon-filesystem-interface.h'
--- libsyncdaemon/syncdaemon-filesystem-interface.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-filesystem-interface.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_FILESYSTEM_INTERFACE_H__
-#define __SYNCDAEMON_FILESYSTEM_INTERFACE_H__
-
-#include "syncdaemon-daemon.h"
-#include "syncdaemon-interface.h"
-#include "syncdaemon-metadata.h"
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE                (syncdaemon_filesystem_interface_get_type ())
-#define SYNCDAEMON_FILESYSTEM_INTERFACE(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE, SyncdaemonFilesystemInterface))
-#define SYNCDAEMON_IS_FILESYSTEM_INTERFACE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE))
-#define SYNCDAEMON_FILESYSTEM_INTERFACE_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE, SyncdaemonFilesystemInterfaceClass))
-#define SYNCDAEMON_IS_FILESYSTEM_INTERFACE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE))
-#define SYNCDAEMON_FILESYSTEM_INTERFACE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_FILESYSTEM_INTERFACE, SyncdaemonFilesystemInterfaceClass))
-
-typedef struct _SyncdaemonFilesystemInterfacePrivate SyncdaemonFilesystemInterfacePrivate;
-
-typedef struct {
-	SyncdaemonInterface parent;
-	SyncdaemonFilesystemInterfacePrivate *priv;
-} SyncdaemonFilesystemInterface;
-
-typedef struct {
-	SyncdaemonInterfaceClass parent_class;
-} SyncdaemonFilesystemInterfaceClass;
-
-GType                          syncdaemon_filesystem_interface_get_type (void);
-
-SyncdaemonFilesystemInterface *syncdaemon_filesystem_interface_new (SyncdaemonDaemon *daemon);
-
-SyncdaemonMetadata            *syncdaemon_filesystem_interface_get_metadata (SyncdaemonFilesystemInterface *interface,
-									     const gchar *path,
-                                                                             gboolean with_subtree_sync_check);
-
-typedef void (* SyncdaemonGotMetadataFunc) (SyncdaemonFilesystemInterface *interface,
-					    gboolean success,
-					    SyncdaemonMetadata *metadata,
-					    gpointer user_data);
-
-void                           syncdaemon_filesystem_interface_get_metadata_async (SyncdaemonFilesystemInterface *interface,
-										   const gchar *path,
-                                                                                   gboolean with_subtree_sync_check,
-										   SyncdaemonGotMetadataFunc callback,
-										   gpointer user_data);
-
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-folder-info.c'
--- libsyncdaemon/syncdaemon-folder-info.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-folder-info.c	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "syncdaemon-folder-info.h"
-
-G_DEFINE_TYPE(SyncdaemonFolderInfo, syncdaemon_folder_info, G_TYPE_OBJECT)
-
-struct _SyncdaemonFolderInfoPrivate {
-	gchar *path;
-	gboolean subscribed;
-	gchar *volume_id;
-};
-
-static void
-syncdaemon_folder_info_finalize (GObject *object)
-{
-	SyncdaemonFolderInfo *finfo = SYNCDAEMON_FOLDER_INFO (object);
-
-	if (finfo->priv != NULL) {
-		if (finfo->priv->path != NULL)
-			g_free (finfo->priv->path);
-
-		if (finfo->priv->volume_id != NULL)
-			g_free (finfo->priv->volume_id);
-
-		g_free (finfo->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_folder_info_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_folder_info_class_init (SyncdaemonFolderInfoClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_folder_info_finalize;
-}
-
-static void
-syncdaemon_folder_info_init (SyncdaemonFolderInfo *finfo)
-{
-	finfo->priv = g_new0 (SyncdaemonFolderInfoPrivate, 1);
-}
-
-/**
- * syncdaemon_folder_info_new:
- */
-SyncdaemonFolderInfo *
-syncdaemon_folder_info_new (void)
-{
-	return g_object_new (SYNCDAEMON_TYPE_FOLDER_INFO, NULL);
-}
-
-/**
- * syncdaemon_folder_info_new_from_hash_table:
- */
-SyncdaemonFolderInfo *
-syncdaemon_folder_info_new_from_hash_table (GHashTable *hash)
-{
-	SyncdaemonFolderInfo *finfo;
-
-	finfo = g_object_new (SYNCDAEMON_TYPE_FOLDER_INFO, NULL);
-	if (hash != NULL) {
-		syncdaemon_folder_info_set_path (finfo, g_hash_table_lookup (hash, "path"));
-		syncdaemon_folder_info_set_subscribed (
-			finfo,
-			g_strcmp0 (g_hash_table_lookup (hash, "subscribed"), "True") == 0);
-		syncdaemon_folder_info_set_volume_id (finfo, g_hash_table_lookup (hash, "volume_id"));
-	}
-
-	return finfo;
-}
-
-/**
- * syncdaemon_folder_info_get_path:
- */
-const gchar *
-syncdaemon_folder_info_get_path (SyncdaemonFolderInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->path;
-}
-
-/**
- * syncdaemon_folder_info_set_path:
- */
-void
-syncdaemon_folder_info_set_path (SyncdaemonFolderInfo *finfo, const gchar *path)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo));
-
-	if (finfo->priv->path != NULL)
-		g_free (finfo->priv->path);
-
-	finfo->priv->path = g_strdup (path);
-}
-
-/**
- * syncdaemon_folder_info_get_subscribed:
- */
-gboolean
-syncdaemon_folder_info_get_subscribed (SyncdaemonFolderInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo), FALSE);
-
-	return finfo->priv->subscribed;
-}
-
-/**
- * syncdaemon_folder_info_set_subscribed:
- */
-void
-syncdaemon_folder_info_set_subscribed (SyncdaemonFolderInfo *finfo, gboolean subscribed)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo));
-
-	finfo->priv->subscribed = subscribed;
-}
-
-/**
- * syncdaemon_folder_info_get_volume_id:
- */
-const gchar *
-syncdaemon_folder_info_get_volume_id (SyncdaemonFolderInfo *finfo)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo), NULL);
-
-	return (const gchar *) finfo->priv->volume_id;
-}
-
-/**
- * syncdaemon_folder_info_set_volume_id:
- */
-void
-syncdaemon_folder_info_set_volume_id (SyncdaemonFolderInfo *finfo, const gchar *volume_id)
-{
-	g_return_if_fail (SYNCDAEMON_IS_FOLDER_INFO (finfo));
-
-	if (finfo->priv->volume_id != NULL)
-		g_free (finfo->priv->volume_id);
-
-	finfo->priv->volume_id = g_strdup (volume_id);
-}

=== removed file 'libsyncdaemon/syncdaemon-folder-info.h'
--- libsyncdaemon/syncdaemon-folder-info.h	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-folder-info.h	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#ifndef __SYNCDAEMON_FOLDER_INFO_H__
-#define __SYNCDAEMON_FOLDER_INFO_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define SYNCDAEMON_TYPE_FOLDER_INFO                (syncdaemon_folder_info_get_type ())
-#define SYNCDAEMON_FOLDER_INFO(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), SYNCDAEMON_TYPE_FOLDER_INFO, SyncdaemonFolderInfo))
-#define SYNCDAEMON_IS_FOLDER_INFO(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SYNCDAEMON_TYPE_FOLDER_INFO))
-#define SYNCDAEMON_FOLDER_INFO_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), SYNCDAEMON_TYPE_FOLDER_INFO, SyncdaemonFolderInfoClass))
-#define SYNCDAEMON_IS_FOLDER_INFO_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), SYNCDAEMON_TYPE_FOLDER_INFO))
-#define SYNCDAEMON_FOLDER_INFO_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), SYNCDAEMON_TYPE_FOLDER_INFO, SyncdaemonFolderInfoClass))
-
-typedef struct _SyncdaemonFolderInfoPrivate SyncdaemonFolderInfoPrivate;
-
-typedef struct {
-	GObject parent;
-	SyncdaemonFolderInfoPrivate *priv;
-} SyncdaemonFolderInfo;
-
-typedef struct {
-	GObjectClass parent_class;
-} SyncdaemonFolderInfoClass;
-
-GType                 syncdaemon_folder_info_get_type (void);
-SyncdaemonFolderInfo *syncdaemon_folder_info_new (void);
-SyncdaemonFolderInfo *syncdaemon_folder_info_new_from_hash_table (GHashTable *hash);
-
-const gchar          *syncdaemon_folder_info_get_path (SyncdaemonFolderInfo *finfo);
-void                  syncdaemon_folder_info_set_path (SyncdaemonFolderInfo *finfo, const gchar *path);
-gboolean              syncdaemon_folder_info_get_subscribed (SyncdaemonFolderInfo *finfo);
-void                  syncdaemon_folder_info_set_subscribed (SyncdaemonFolderInfo *finfo, gboolean subscribed);
-const gchar          *syncdaemon_folder_info_get_volume_id (SyncdaemonFolderInfo *finfo);
-void                  syncdaemon_folder_info_set_volume_id (SyncdaemonFolderInfo *finfo, const gchar *volume_id);
-
-G_END_DECLS
-
-#endif

=== removed file 'libsyncdaemon/syncdaemon-folders-interface.c'
--- libsyncdaemon/syncdaemon-folders-interface.c	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/syncdaemon-folders-interface.c	1970-01-01 00:00:00 +0000
@@ -1,494 +0,0 @@
-/*
- * Syncdaemon API
- *
- * Authors: Rodrigo Moya <[e-mail]>
- *
- * Copyright 2010-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-
-#include "config.h"
-#include "syncdaemon-folders-interface.h"
-#include "utils.h"
-
-G_DEFINE_TYPE(SyncdaemonFoldersInterface, syncdaemon_folders_interface, SYNCDAEMON_TYPE_INTERFACE)
-
-struct _SyncdaemonFoldersInterfacePrivate {
-	GObject *proxy;
-	GHashTable *folders;
-};
-
-static void
-syncdaemon_folders_interface_finalize (GObject *object)
-{
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (object);
-
-	if (interface->priv != NULL) {
-		if (interface->priv->folders != NULL)
-			g_hash_table_destroy (interface->priv->folders);
-
-		g_free (interface->priv);
-	}
-
-	G_OBJECT_CLASS (syncdaemon_folders_interface_parent_class)->finalize (object);
-}
-
-static void
-syncdaemon_folders_interface_class_init (SyncdaemonFoldersInterfaceClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = syncdaemon_folders_interface_finalize;
-}
-
-static void
-folder_created_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-
-	/* Update our cache of folders */
-	if (interface->priv->folders != NULL) {
-		g_hash_table_insert (interface->priv->folders,
-				     g_strdup (syncdaemon_folder_info_get_path (folder_info)),
-				     folder_info);
-
-		if (daemon != NULL)
-			g_signal_emit_by_name (daemon, "folder_created", TRUE, folder_info);
-	} else {
-		if (daemon != NULL)
-			g_signal_emit_by_name (daemon, "folder_created", TRUE, folder_info);
-		g_object_unref (G_OBJECT (folder_info));
-	}
-}
-
-static void
-folder_create_error_cb (DBusGProxy *proxy, GHashTable *hash, gchar *error, gpointer user_data)
-{
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	/* Notify listeners */
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL) {
-		SyncdaemonFolderInfo *folder_info;
-
-		folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-		g_signal_emit_by_name (daemon, "folder_created", FALSE, folder_info);
-		g_object_unref (G_OBJECT (folder_info));
-	}
-}
-
-static void
-folder_deleted_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	/* Notify listeners */
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_deleted", TRUE, folder_info);
-
-	/* Update our cache of folders */
-	if (interface->priv->folders != NULL)
-		g_hash_table_remove (interface->priv->folders,
-				     syncdaemon_folder_info_get_path (folder_info));
-
-	g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-folder_delete_error_cb (DBusGProxy *proxy, GHashTable *hash, gchar *error, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	/* Notify listeners */
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_deleted", FALSE, folder_info);
-
-	g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-folder_subscribed_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_subscribed", TRUE, folder_info);
-
-	if (interface->priv->folders != NULL) {
-		g_hash_table_insert (interface->priv->folders,
-				     g_strdup (syncdaemon_folder_info_get_path (folder_info)),
-				     folder_info);
-	} else
-		g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-folder_subscribe_error_cb (DBusGProxy *proxy, GHashTable *hash, gchar *error, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_subscribed", FALSE, folder_info);
-
-	g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-folder_unsubscribed_cb (DBusGProxy *proxy, GHashTable *hash, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_unsubscribed", TRUE, folder_info);
-
-	if (interface->priv->folders != NULL) {
-		g_hash_table_insert (interface->priv->folders,
-				     g_strdup (syncdaemon_folder_info_get_path (folder_info)),
-				     folder_info);
-	} else
-		g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-folder_unsubscribe_error_cb (DBusGProxy *proxy, GHashTable *hash, gchar *error, gpointer user_data)
-{
-	SyncdaemonFolderInfo *folder_info;
-	SyncdaemonDaemon *daemon = NULL;
-	SyncdaemonFoldersInterface *interface = SYNCDAEMON_FOLDERS_INTERFACE (user_data);
-
-	folder_info = syncdaemon_folder_info_new_from_hash_table (hash);
-
-	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
-	if (daemon != NULL)
-		g_signal_emit_by_name (daemon, "folder_unsubscribed", FALSE, folder_info);
-
-	g_object_unref (G_OBJECT (folder_info));
-}
-
-static void
-syncdaemon_folders_interface_init (SyncdaemonFoldersInterface *interface)
-{
-	interface->priv = g_new0 (SyncdaemonFoldersInterfacePrivate, 1);
-
-	/* Setup DBus proxy */
-	interface->priv->proxy = syncdaemon_interface_setup_proxy (SYNCDAEMON_INTERFACE (interface),
-								   "com.ubuntuone.SyncDaemon",
-								   "/folders", "com.ubuntuone.SyncDaemon.Folders");
-	if (interface->priv->proxy != NULL) {
-		/* Connect to DBus proxy signals */
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderCreated",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderCreated",
-					     G_CALLBACK (folder_created_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderDeleted",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderDeleted",
-					     G_CALLBACK (folder_deleted_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderSubscribed",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderSubscribed",
-					     G_CALLBACK (folder_subscribed_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderUnSubscribed",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderUnSubscribed",
-					     G_CALLBACK (folder_unsubscribed_cb), interface, NULL);
-
-		/* Error signals */
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderCreateError",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_STRING,
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderCreateError",
-					     G_CALLBACK (folder_create_error_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderDeleteError",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_STRING,
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderDeleteError",
-					     G_CALLBACK (folder_delete_error_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderSubscribeError",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_STRING,
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderSubscribeError",
-					     G_CALLBACK (folder_subscribe_error_cb), interface, NULL);
-
-		dbus_g_proxy_add_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderUnSubscribeError",
-					 dbus_g_type_get_map ("GHashTable",
-							      G_TYPE_STRING,
-							      G_TYPE_STRING),
-					 G_TYPE_STRING,
-					 G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal (DBUS_G_PROXY (interface->priv->proxy), "FolderUnSubscribeError",
-					     G_CALLBACK (folder_unsubscribe_error_cb), interface, NULL);
-	}
-}
-
-/**
- * syncdaemon_folders_interface_new:
- */
-SyncdaemonFoldersInterface *
-syncdaemon_folders_interface_new (SyncdaemonDaemon *daemon)
-{
-	g_return_val_if_fail (SYNCDAEMON_IS_DAEMON (daemon), NULL);
-
-	return g_object_new (SYNCDAEMON_TYPE_FOLDERS_INTERFACE, "daemon", daemon, NULL);
-}
-
-/**
- * syncdaemon_folders_interface_create:
- */