Merge lp:~dobey/ubuntu/lucid/ubuntuone-client/trunk into lp:ubuntu/lucid/ubuntuone-client

[dobey]

=== modified file 'Makefile.am'
--- Makefile.am	2009-09-28 18:15:00 +0000
+++ Makefile.am	2010-02-18 00:10:25 +0000
@@ -18,17 +18,17 @@
 
 # Install our scripts and extra data here
 bin_SCRIPTS =				\
-	bin/ubuntuone-client-applet	\
-	bin/ubuntuone-client-preferences	\
+	bin/ubuntuone-preferences	\
 	bin/u1sdtool			\
 	bin/u1sync
 
-libexec_SCRIPTS = bin/ubuntuone-syncdaemon
+libexec_SCRIPTS = 			\
+	bin/ubuntuone-login		\
+	bin/ubuntuone-syncdaemon
 
 manfilesdir = $(mandir)/man1
 manfiles_DATA =					\
-	docs/man/ubuntuone-client-preferences.1	\
-	docs/man/ubuntuone-client-applet.1	\
+	docs/man/ubuntuone-preferences.1	\
 	docs/man/u1sdtool.1			\
 	docs/man/u1sync.1
 
@@ -52,16 +52,25 @@
 		fi; \
 	fi
 
+logging.conf: data/logging.conf.in Makefile
+	$(MAKE) -C data logging.conf
+
 lint: protocol pylintrc Makefile
 	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" \
 	$(PYTHON) $(srcdir)/contrib/pylint-wrapper
 
-check: lint Makefile
+test: protocol logging.conf $(clientdefs_DATA) Makefile
 	if test "x$(builddir)" == "x$(srcdir)"; then \
 		PYTHONPATH="$(PYTHONPATH)" $(PYTHON) $(srcdir)/contrib/test; \
 	fi
 	rm -rf _trial_temp
 
+check: lint test Makefile
+
+docs: protocol Makefile
+	PYTHONPATH="$(PYTHONPATH)" $(PYTHON) $(srcdir)/contrib/dbus-docs
+
+
 protocol: ubuntuone Makefile
 	PROTOCOL="ubuntuone/storageprotocol"; \
 	if [ ! -d $(USP_PATH) ]; then \

=== modified file 'Makefile.in'
--- Makefile.in	2009-09-28 18:15:00 +0000
+++ Makefile.in	2010-02-18 00:10:25 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -183,6 +183,8 @@
 LIPO = @LIPO@
 LNDIR = @LNDIR@
 LN_S = @LN_S@
+LOG_FILE_SIZE = @LOG_FILE_SIZE@
+LOG_LEVEL = @LOG_LEVEL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -293,16 +295,17 @@
 
 # Install our scripts and extra data here
 bin_SCRIPTS = \
-	bin/ubuntuone-client-applet	\
-	bin/ubuntuone-client-preferences	\
+	bin/ubuntuone-preferences	\
 	bin/u1sdtool			\
 	bin/u1sync
 
-libexec_SCRIPTS = bin/ubuntuone-syncdaemon
+libexec_SCRIPTS = \
+	bin/ubuntuone-login		\
+	bin/ubuntuone-syncdaemon
+
 manfilesdir = $(mandir)/man1
 manfiles_DATA = \
-	docs/man/ubuntuone-client-preferences.1	\
-	docs/man/ubuntuone-client-applet.1	\
+	docs/man/ubuntuone-preferences.1	\
 	docs/man/u1sdtool.1			\
 	docs/man/u1sync.1
 
@@ -522,7 +525,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -547,7 +550,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -711,7 +714,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -755,17 +759,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -970,16 +974,24 @@
 		fi; \
 	fi
 
+logging.conf: data/logging.conf.in Makefile
+	$(MAKE) -C data logging.conf
+
 lint: protocol pylintrc Makefile
 	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" \
 	$(PYTHON) $(srcdir)/contrib/pylint-wrapper
 
-check: lint Makefile
+test: protocol logging.conf $(clientdefs_DATA) Makefile
 	if test "x$(builddir)" == "x$(srcdir)"; then \
 		PYTHONPATH="$(PYTHONPATH)" $(PYTHON) $(srcdir)/contrib/test; \
 	fi
 	rm -rf _trial_temp
 
+check: lint test Makefile
+
+docs: protocol Makefile
+	PYTHONPATH="$(PYTHONPATH)" $(PYTHON) $(srcdir)/contrib/dbus-docs
+
 protocol: ubuntuone Makefile
 	PROTOCOL="ubuntuone/storageprotocol"; \
 	if [ ! -d $(USP_PATH) ]; then \

=== modified file 'aclocal.m4'
--- aclocal.m4	2009-08-26 12:15:00 +0000
+++ aclocal.m4	2010-02-18 00:10:25 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -224,7 +224,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -240,7 +240,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1068,6 +1068,14 @@
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pythondir], [$am_cv_python_pythondir])
@@ -1098,6 +1106,14 @@
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2009-12-07 17:35:00 +0000
+++ bin/u1sdtool	2010-02-18 00:10:25 +0000
@@ -28,7 +28,7 @@
 
 from dbus.mainloop.glib import DBusGMainLoop
 from optparse import OptionParser
-from twisted.internet import reactor
+from twisted.internet import reactor, defer
 
 from ubuntuone.syncdaemon.tools import SyncDaemonTool
 from ubuntuone.syncdaemon.dbus_interface import DBUS_IFACE_NAME
@@ -38,45 +38,16 @@
     show_downloads, 
     show_shares,
     show_shared,
+    show_folders,
+    show_error,
+    show_state,
+    show_waiting_content,
+    is_running,
 )
 
 
-def main(argv, stdout):
-    usage = "Usage: %prog [option]"
-    parser = OptionParser(usage=usage)
-    parser.add_option("-w", "--wait", dest="wait", action="store_true",
-                      help="Wait until ubuntuone-syncdaemon reaches nirvana")
-    parser.add_option("", "--accept-share", dest="accept_share",
-                      metavar="SHARE_ID",
-                      help="accept the share with the specified id")
-    parser.add_option("", "--reject-share", dest="reject_share",
-                      metavar="SHARE_ID",
-                      help="reject the share with the specified id")
-    parser.add_option("", "--list-shares", dest="list_shares",
-                      action="store_true",
-                      help=" get the list of shares")
-    parser.add_option("", "--refresh-shares", dest="refresh_shares",
-                      action="store_true",
-                      help=" request a refresh of the list of shares to"
-                      " the server")
-    parser.add_option("", "--offer-share", dest="offer_share",
-                      metavar="PATH USER SHARE_NAME ACCESS_LEVEL",
-                      help=" share PATH to USER. ")
-    parser.add_option("", "--list-shared", dest="list_shared",
-                      action="store_true",
-                      help=" list the shared path's/shares offered. ")
-    parser.add_option("", "--refresh", dest="refresh_path",
-                      metavar="PATH", help=" request a refresh of PATH")
-    parser.add_option("", "--info", dest="path_info",
-                      metavar="PATH", help=" request the metadata of PATH")
-    parser.add_option("", "--current-transfers", dest="current_transfers",
-                      action="store_true",
-                      help=" show the current uploads and downloads")
-    parser.add_option("-q", "--quit", dest="quit", action='store_true',
-                      help="shutdown the syncdaemon")
-
-    (options, args) = parser.parse_args(argv)
-
+def main(options, args, stdout):
+    """entry point"""
     loop = DBusGMainLoop(set_as_default=True)
     bus = dbus.SessionBus(mainloop=loop)
     sync_daemon_tool = SyncDaemonTool(bus)
@@ -86,6 +57,28 @@
     if out_encoding is None:
         out_encoding = 'utf-8'
     out = codecs.getwriter(out_encoding)(stdout, errors='replace')
+    # start syncdaemon if it's required
+    if not is_running() and not options.quit and not options.start:
+        d = sync_daemon_tool.start()
+        d.addBoth(lambda _: run(options, sync_daemon_tool, out))
+    else:
+        d = run(options, sync_daemon_tool, out)
+
+    def default_errback(error):
+        """ default error handler. """
+        out.write("\nOops, an error ocurred:\n")
+        error.printTraceback()
+
+    def stop_reactor(result):
+        """ stop the reactor. """
+        if reactor.running:
+            reactor.stop()
+    d.addErrback(default_errback)
+    d.addCallback(stop_reactor)
+    return d
+
+
+def run(options, sync_daemon_tool, out):
     if options.wait:
         def callback(result):
             """ wait_for_nirvana callback (stop the reactor and exit)"""
@@ -104,12 +97,29 @@
     elif options.refresh_shares:
         d = sync_daemon_tool.refresh_shares()
     elif options.offer_share:
-        if len(args) != 4:
-            parser.error('--offer-share requires 4 arguments')
-        d = sync_daemon_tool.offer_share(options.offer_share, *args[1:])
+        path, username, name, access_level = options.offer_share
+        d = sync_daemon_tool.offer_share(path, username, name, access_level)
     elif options.list_shared:
         d = sync_daemon_tool.list_shared()
         d.addCallback(lambda r: show_shared(r, out))
+    elif options.create_folder:
+        if not os.path.exists(options.create_folder):
+            parser.error("PATH: '%s' don't exists" % \
+                         options.create_folder)
+        d = sync_daemon_tool.create_folder(options.create_folder)
+        d.addErrback(lambda r: show_error(r, out))
+    elif options.delete_folder:
+        d = sync_daemon_tool.delete_folder(options.delete_folder)
+        d.addErrback(lambda r: show_error(r, out))
+    elif options.list_folders:
+        d = sync_daemon_tool.get_folders()
+        d.addCallback(lambda r: show_folders(r, out))
+    elif options.subscribe_folder:
+        d = sync_daemon_tool.subscribe_folder(options.subscribe_folder)
+        d.addErrback(lambda r: show_error(r, out))
+    elif options.unsubscribe_folder:
+        d = sync_daemon_tool.unsubscribe_folder(options.unsubscribe_folder)
+        d.addErrback(lambda r: show_error(r, out))
     elif options.refresh_path:
         if not os.path.exists(options.refresh_path):
             parser.error("PATH: '%s' don't exists" % \
@@ -129,32 +139,98 @@
     elif options.quit:
         d = sync_daemon_tool.quit()
         def shutdown_check(result):
-            if result is None and \
-               DBUS_IFACE_NAME in bus.list_names():
+            if result is None and not is_running():
                 out.write("ubuntuone-syncdaemon stopped.\n")
             else:
                 out.write("ubuntuone-syncdaemon still running.\n")
         d.addBoth(shutdown_check)
+    elif options.connect:
+        d = sync_daemon_tool.connect()
+    elif options.disconnect:
+        d = sync_daemon_tool.disconnect()
+    elif options.status:
+        d = sync_daemon_tool.get_status()
+        d.addCallback(lambda r: show_state(r, out))
+    elif options.waiting_content:
+        d = sync_daemon_tool.waiting_content()
+        d.addCallback(lambda r: show_waiting_content(r, out))
+    elif options.schedule_next:
+        share_id, node_id = options.schedule_next
+        d = sync_daemon_tool.schedule_next(share_id, node_id)
+    elif options.start:
+        d = sync_daemon_tool.start()
     else:
         parser.print_help()
-        sys.exit(1)
-
-    def default_errback(error):
-        """ default error handler. """
-        out.write("\nOops, an error ocurred:\n")
-        error.printTraceback()
-
-    def stop_reactor(result):
-        """ stop the reactor. """
-        if reactor.running:
-            reactor.stop()
-    d.addErrback(default_errback)
-    d.addCallback(stop_reactor)
-    reactor.run()
+        d = defer.succeed(None)
+    return d
 
 
 if __name__ == '__main__':
     # disable the dbus warnings
     warnings.filterwarnings('ignore', module='dbus')
-    main(sys.argv, sys.stdout)
+    usage = "Usage: %prog [option]"
+    parser = OptionParser(usage=usage)
+    parser.add_option("-w", "--wait", dest="wait", action="store_true",
+                      help="Wait until ubuntuone-syncdaemon reaches nirvana")
+    parser.add_option("", "--accept-share", dest="accept_share",
+                      metavar="SHARE_ID",
+                      help="Accept the share with the specified id")
+    parser.add_option("", "--reject-share", dest="reject_share",
+                      metavar="SHARE_ID",
+                      help="Reject the share with the specified id")
+    parser.add_option("", "--list-shares", dest="list_shares",
+                      action="store_true",
+                      help="Get the list of shares")
+    parser.add_option("", "--refresh-shares", dest="refresh_shares",
+                      action="store_true",
+                      help="Request a refresh of the list of shares to"
+                      " the server")
+    parser.add_option("", "--offer-share", dest="offer_share", type="string", 
+                      nargs=4, metavar="PATH USER SHARE_NAME ACCESS_LEVEL",
+                      help="Share PATH to USER. ")
+    parser.add_option("", "--list-shared", dest="list_shared",
+                      action="store_true",
+                      help="List the shared path's/shares offered. ")
+    parser.add_option("", "--create-folder", dest="create_folder",
+                      metavar="PATH",
+                      help="Create user defined folder in the specified path")
+    parser.add_option("", "--delete-folder", dest="delete_folder",
+                      metavar="FOLDER_ID",
+                      help="Delete user defined folder in the specified path")
+    parser.add_option("", "--list-folders", dest="list_folders",
+                      action="store_true",
+                      help="List all the user defined folders")
+    parser.add_option("", "--subscribe-folder", dest="subscribe_folder",
+                      metavar="FOLDER_ID",
+                      help="Subscribe to the folder specified by id")
+    parser.add_option("", "--unsubscribe-folder", dest="unsubscribe_folder",
+                      metavar="FOLDER_ID",
+                      help="Unsubscribe from the folder specified by id")
+    parser.add_option("", "--refresh", dest="refresh_path",
+                      metavar="PATH", help="Request a refresh of PATH")
+    parser.add_option("", "--info", dest="path_info",
+                      metavar="PATH", help="Request the metadata of PATH")
+    parser.add_option("", "--current-transfers", dest="current_transfers",
+                      action="store_true",
+                      help=" show the current uploads and downloads")
+    parser.add_option("-q", "--quit", dest="quit", action='store_true',
+                      help="Shutdown the syncdaemon")
+    parser.add_option("-c", "--connect", dest="connect", action='store_true',
+                      help="Connect the syncdaemon")
+    parser.add_option("-d", "--disconnect", dest="disconnect", 
+                      action='store_true', help="Disconnect the syncdaemon")
+    parser.add_option("-s", "--status", dest="status", action='store_true', 
+                      help="Get the current status of syncdaemon")
+    parser.add_option("", "--waiting-content", dest="waiting_content", 
+                      action='store_true', help="Get the waiting content list")
+    parser.add_option("", "--schedule-next", dest="schedule_next", 
+                      metavar="SHARE_ID NODE_ID", nargs=2, type='string',
+                      help="Move the node to be the next in the queue of "
+                      "waiting commands")
+    parser.add_option("", "--start", dest="start", action='store_true', 
+                      help="Start syncdaemon if it's not running")
+
+    (options, args) = parser.parse_args(sys.argv)
+    reactor.callWhenRunning(main, options, args, sys.stdout)
+    reactor.run()
 

=== removed file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-12-07 17:35:00 +0000
+++ bin/ubuntuone-client-applet	1970-01-01 00:00:00 +0000
@@ -1,1063 +0,0 @@
-#!/usr/bin/python
-
-# ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
-#
-# Author: Rodney Dawes <[e-mail]>
-#
-# Copyright 2009 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/>.
-
-from __future__ import with_statement
-
-import pygtk
-pygtk.require('2.0')
-import gobject
-import gtk
-import pango
-import os
-import subprocess
-import sys
-import gettext
-from ubuntuone import clientdefs
-
-import dbus.service
-
-# pylint: disable-msg=F0401
-import pynotify
-
-from ConfigParser import ConfigParser
-from dbus.exceptions import DBusException
-from dbus.mainloop.glib import DBusGMainLoop
-from ubuntuone.oauthdesktop.main import Login
-from xdg.BaseDirectory import xdg_config_home
-from threading import Lock, Thread
-from urllib import quote
-
-from ubuntuone.oauthdesktop.logger import setupLogging
-logger = setupLogging("UbuntuOne.Client.Applet")
-
-DBusGMainLoop(set_as_default=True)
-
-_ = gettext.gettext
-ngettext = gettext.ngettext
-
-APPLET_BUS_NAME = "com.ubuntuone.ClientApplet"
-APPLET_CONFIG_NAME = APPLET_BUS_NAME + ".Config"
-
-DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
-DBUS_IFACE_SYNC_NAME = "com.ubuntuone.SyncDaemon.SyncDaemon"
-DBUS_IFACE_STATUS_NAME = "com.ubuntuone.SyncDaemon.Status"
-DBUS_IFACE_CONFIG_NAME = "com.ubuntuone.SyncDaemon.Config"
-
-DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
-
-OAUTH_REALM = "https://ubuntuone.com"
-OAUTH_CONSUMER = "ubuntuone"
-BOOKMARK_NAME = "Ubuntu One"
-
-NOTIFY_ICON_SIZE = 48
-
-# Why thank you GTK+ for enforcing style-set and breaking API
-RCSTYLE = """
-style 'dialogs' {
-  GtkDialog::action-area-border = 12
-  GtkDialog::button-spacing = 6
-  GtkDialog::content-area-border = 0
-}
-widget_class '*Dialog*' style 'dialogs'
-"""
-
-CONF_FILE = os.path.join(xdg_config_home, "ubuntuone", "ubuntuone-client.conf")
-
-
-def dbus_async(*args):
-      """Simple handler to make dbus do stuff async."""
-      pass
-
-class AppletMain(object):
-      """Main applet process class."""
-
-      def __init__(self, *args, **kw):
-            """Initializes the child threads and dbus monitor."""
-            from twisted.internet import gtk2reactor
-            gtk2reactor.install()
-            login = Login(dbus.service.BusName(DBUS_IFACE_AUTH_NAME,
-                                               bus=dbus.SessionBus()))
-
-            logger.info(_("Starting Ubuntu One client version %s") %
-                        clientdefs.VERSION)
-
-            # Whether or not we are authorized
-            self.is_authorized = False
-
-            # Load the config, with some defaults if it doesn't exist yet
-            if not os.path.isdir(os.path.dirname(CONF_FILE)):
-                  os.makedirs(os.path.dirname(CONF_FILE))
-
-            self.config = ConfigParser()
-            self.config.read(CONF_FILE)
-
-            if not self.config.has_section("ubuntuone"):
-                  self.config.add_section("ubuntuone")
-
-            if not self.config.has_option("ubuntuone", "show_applet"):
-                  self.config.set("ubuntuone", "show_applet", "1")
-
-            if not self.config.has_option("ubuntuone", "connect"):
-                  self.config.set("ubuntuone", "connect", "0")
-
-            if not self.config.has_option("ubuntuone", "connected"):
-                  self.config.set("ubuntuone", "connected", "False")
-
-            if not self.config.has_option("ubuntuone", "bookmarked"):
-                  self.config.set("ubuntuone", "bookmarked", "False")
-
-            self.show_applet = self.config.getint("ubuntuone", "show_applet")
-            self.connect = self.config.getint("ubuntuone", "connect")
-            self.connected = self.config.getboolean("ubuntuone", "connected")
-
-            if not os.path.exists(CONF_FILE):
-                  with open(CONF_FILE, "w+b") as f:
-                        self.config.write(f)
-
-            # Handle some DBus signals
-            self.__bus = dbus.SessionBus()
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__new_credentials,
-                  signal_name="NewCredentials",
-                  dbus_interface=DBUS_IFACE_AUTH_NAME)
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__auth_denied,
-                  signal_name="AuthorizationDenied",
-                  dbus_interface=DBUS_IFACE_AUTH_NAME)
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__no_credentials,
-                  signal_name="NoCredentials",
-                  dbus_interface=DBUS_IFACE_AUTH_NAME)
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__got_oauth_error,
-                  signal_name="OAuthError",
-                  dbus_interface=DBUS_IFACE_AUTH_NAME)
-
-            self.__icon = AppletIcon(main=self, config=self.config)
-
-      def __new_credentials(self, realm=None, consumer_key=None, sender=None):
-            """Signal callback for when we get new credentials."""
-            self.is_authorized = True
-
-            self.__start_storage_daemon()
-            self.add_to_autostart()
-
-            self.set_up_desktopcouch_pairing(consumer_key)
-
-            if self.connect == 2:
-                  return
-
-            if self.connect == 1 and not self.connected:
-                  return
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  iface.connect(reply_handler=dbus_async,
-                                error_handler=self.sd_dbus_error)
-            except DBusException, e:
-                  self.sd_dbus_error(e)
-
-      def __auth_denied(self):
-            """Signal callback for when auth was denied by user."""
-            self.is_authorized = False
-            self.remove_from_autostart()
-
-            def quit_error(e):
-                  """Only log when quit fails."""
-                  logger.error(_("Quit Error: %s") % e.get_dbus_message())
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                      follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  iface.quit(reply_handler=dbus_async,
-                             error_handler=quit_error)
-            except DBusException, e:
-                  quit_error(e)
-
-            from twisted.internet import reactor
-            reactor.stop()
-
-      def __no_credentials(self):
-            """Signal callback for when no credentials exist in the keyring."""
-            self.is_authorized = False
-
-      def __got_oauth_error(self, message=None):
-            """Signal callback for when an OAuth error occured."""
-            def dialog_response(dialog, response):
-                  """Handle the dialog closing."""
-                  dialog.destroy()
-
-            if message:
-                  logger.error(message)
-                  dialog = gtk.Dialog(title=_("Ubuntu One: Error"),
-                                      flags=gtk.DIALOG_NO_SEPARATOR,
-                                      buttons=(gtk.STOCK_CLOSE,
-                                               gtk.RESPONSE_CLOSE))
-                  dialog.set_default_response(gtk.RESPONSE_CLOSE)
-                  dialog.set_icon_name("ubuntuone-client")
-
-                  area = dialog.get_content_area()
-
-                  hbox = gtk.HBox(spacing=12)
-                  hbox.set_border_width(12)
-                  area.pack_start(hbox)
-                  hbox.show()
-
-                  image = gtk.Image()
-                  image.set_from_icon_name("dialog-error", gtk.ICON_SIZE_DIALOG)
-                  image.set_alignment(0.5, 0.0)
-                  image.show()
-                  hbox.pack_start(image, False, False)
-
-                  vbox = gtk.VBox(spacing=12)
-                  vbox.show()
-                  hbox.pack_start(vbox)
-
-                  label = gtk.Label("<b>%s</b>" % _("Authorization Error"))
-                  label.set_use_markup(True)
-                  label.set_alignment(0.0, 0.5)
-                  label.show()
-                  vbox.pack_start(label, False, False)
-
-                  label = gtk.Label(message)
-                  label.set_line_wrap(True)
-                  label.set_max_width_chars(64)
-                  label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
-                  label.set_alignment(0.0, 0.0)
-                  label.show()
-                  vbox.pack_start(label, True, True)
-
-                  dialog.connect('close', dialog_response, gtk.RESPONSE_CLOSE)
-                  dialog.connect('response', dialog_response)
-
-                  dialog.show()
-            else:
-                  logger.error(_("Got an OAuth error with no message."))
-
-      def check_for_token(self, do_login=False):
-            """Method to check for an existing token."""
-            def local_dbus_error(e):
-                  """Can't talk to ourself?"""
-                  logger.error(_("Internal Error: %s") % e.get_dbus_message())
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_AUTH_NAME, "/",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
-                  iface.maybe_login(OAUTH_REALM, OAUTH_CONSUMER,
-                                    do_login,
-                                    reply_handler=dbus_async,
-                                    error_handler=local_dbus_error)
-            except DBusException, e:
-                  local_dbus_error(e)
-                  return False
-
-            return False
-
-      def __start_storage_daemon_maybe(self):
-            """Start the storage daemon."""
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  iface.get_rootdir(reply_handler=dbus_async,
-                                    error_handler=self.sd_dbus_error)
-            except DBusException, e:
-                  self.sd_dbus_error(e)
-                  return False
-
-            return False
-
-      def __start_storage_daemon(self):
-            """Need to call dbus from a idle callback"""
-            gobject.idle_add(self.__start_storage_daemon_maybe)
-
-      def add_to_autostart(self):
-            """Add ourself to the autostart config."""
-            autostart_entry = """[Desktop Entry]
-Name=Ubuntu One
-Exec=ubuntuone-client-applet
-Icon=ubuntuone-client
-Terminal=false
-Type=Application
-X-Ubuntu-Gettext-Domain=ubuntuone-client
-X-KDE-autostart-after=panel
-X-GNOME-Autostart-enabled=true
-"""
-            if not os.path.exists(os.path.join(xdg_config_home, "autostart")):
-                  os.makedirs(os.path.join(xdg_config_home, "autostart"))
-
-            file_path = os.path.join(xdg_config_home, "autostart",
-                                     "ubuntuone-client-applet.desktop")
-            if not os.path.exists(file_path):
-                  with open(file_path, "w+") as f:
-                        f.write(autostart_entry)
-
-      def remove_from_autostart(self):
-            """Remove ourself from the autostart config."""
-            path = os.path.join(xdg_config_home, "autostart",
-                                "ubuntuone-client-applet.desktop")
-            try:
-                  os.unlink(path)
-            except OSError:
-                  pass
-
-      def set_up_desktopcouch_pairing(self, consumer_key):
-          """Add a pairing record between desktopcouch and Ubuntu One"""
-          try:
-              from desktopcouch.pair.couchdb_pairing.couchdb_io import \
-                   put_static_paired_service, PAIRED_SERVER_RECORD_TYPE
-              from desktopcouch.records.server import CouchDatabase
-          except ImportError:
-              # desktopcouch is not installed
-              logger.debug(_("Not adding desktopcouch pairing since"
-                  " desktopcouch is not installed"))
-              return
-          # Check whether there is already a record of the Ubuntu One service
-          db = CouchDatabase("management", create=True)
-          if not db.view_exists("ubuntu_one_pair_record","ubuntu_one_pair_record"):
-              map_js = """function(doc) {
-                  if (doc.service_name == "ubuntuone") {
-                      if (doc.application_annotations &&
-                          doc.application_annotations["Ubuntu One"] &&
-                          doc.application_annotations["Ubuntu One"]["private_application_annotations"] &&
-                          doc.application_annotations["Ubuntu One"]["private_application_annotations"]["deleted"]) {
-                          emit(doc._id, 1);
-                      } else {
-                          emit(doc._id, 0)
-                      }
-                  }
-              }"""
-              db.add_view("ubuntu_one_pair_record", map_js, None,
-                  "ubuntu_one_pair_record")
-          results = db.execute_view("ubuntu_one_pair_record",
-              "ubuntu_one_pair_record")
-          found = False
-          deleted = False
-          # Results should contain either one row or no rows
-          # If there is one row, its value will be 0, meaning that there is
-          #   already an Ubuntu One pairing record, or 1, meaning that there
-          #   was an Ubuntu One pairing record but it has since been unpaired
-          # Only create a new record if there is not one already. Specifically,
-          #   do not add the record if there is a deleted one, as this means
-          #   that the user explicitly unpaired it!
-          for row in results:
-              found = True
-              if row.value == 1:
-                  deleted = True
-                  logger.debug(_("Not adding desktopcouch pairing since"
-                  " the user has explicitly unpaired with Ubuntu One"))
-              else:
-                  logger.debug(_("Not adding desktopcouch pairing since"
-                  " we are already paired"))
-          if not found:
-              put_static_paired_service(None, "ubuntuone")
-              logger.debug(_("Pairing desktopcouch with Ubuntu One"))
-
-      def main(self):
-            """Starts the gtk main loop."""
-            from twisted.internet import reactor
-            if self.connect != 2 or (self.connect == 1 and self.connected):
-                  gobject.idle_add(self.check_for_token, True)
-
-            reactor.run()
-
-      @property
-      def authorized(self):
-            """Are we authorized?"""
-            return self.is_authorized
-
-      def sd_dbus_error(self, error):
-            """Got an error from DBus."""
-            self.__icon.sd_dbus_error(error)
-
-
-
-def do_config_open_real():
-      """Opens the preferences dialog."""
-      paths = os.environ["PATH"].split(":")
-      dirpath = os.path.join(os.getcwd(), "bin")
-      if os.path.isdir(dirpath):
-            paths.insert(0, dirpath)
-      os.environ["PATH"] = ":".join(paths)
-      try:
-            ret = subprocess.call(["ubuntuone-client-preferences"],
-                                  env=os.environ)
-      except OSError:
-            ret = -1
-      if ret != 0:
-            logger.error(_("Failed to open Ubuntu One preferences"))
-
-def do_config_open():
-      """Do the preferences opening in a thread."""
-      Thread(target=do_config_open_real, name="preferences").start()
-
-def do_xdg_open_real(path_or_url):
-      """Utility method to run xdg-open with path_or_url."""
-      ret = subprocess.call(["xdg-open", path_or_url], env=os.environ)
-      if ret != 0:
-            logger.error(_("Failed to run 'xdg-open %s'") % path_or_url)
-
-def do_xdg_open(path_or_url):
-      """Do the xdg-open in a thread."""
-      Thread(target=do_xdg_open_real, name="xdg", args=(path_or_url,)).start()
-
-
-class AppletIcon(gtk.StatusIcon):
-      """
-      Custom StatusIcon derived from gtk.StatusIcon which supports
-      animated icons and a few other nice things.
-      """
-
-      def __init__(self, main=None, config=None, *args, **kw):
-            """Initializes our custom StatusIcon based widget."""
-            super(AppletIcon, self).__init__(*args, **kw)
-            # Hide until we get status, to avoid flickering
-            self.set_visible(False)
-
-            # The AppletMain object
-            self.__main = main
-
-            # A ConfigParser object that we can poke at
-            self.__config = config
-            self.__show_when = self.__config.getint("ubuntuone", "show_applet")
-
-            self.__managed_dir = None
-
-            self.__size = 24
-            self.__theme = gtk.icon_theme_get_default()
-            iconpath = os.path.abspath(os.path.join(
-                        os.path.split(os.path.dirname(__file__))[0],
-                        "data"))
-            self.__theme.append_search_path(iconpath)
-
-            self.__theme.append_search_path(os.path.sep + os.path.join(
-                        "usr", "share", "ubuntuone-client", "icons"))
-            self.__theme.append_search_path(os.path.sep + os.path.join(
-                        "usr", "local", "share", "ubuntuone-client", "icons"))
-
-            self.set_from_icon_name('ubuntuone-client-offline')
-            self.set_tooltip(_("Disconnected"))
-            self.connect("popup-menu", self.__popup_menu)
-            self.connect("activate", self.__do_action)
-
-            self.__size_changed(self, self.__size)
-
-            self.__litems = {}
-            self.__ritems = {}
-            self.__status_menu, self.__config_menu = self.__build_menus()
-
-            self.__connected = False
-            self.__need_update = False
-            self.__fatal_error = False
-
-            pynotify.init("Ubuntu One")
-
-            # Managing applet visibility
-            self.__visible = True
-            self.__visible_id = 0
-
-            # Up/Dn status
-            self.__lock = Lock()
-            self.__updating = 0
-            self.__total = 0
-            self.__last_id = 0
-
-            self.__bus = dbus.SessionBus()
-
-            # Our own DBus service, for the config to deal with
-            self.__service = AppletConfig(icon=self)
-
-            # DBus signal handling
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__status_changed,
-                  signal_name="StatusChanged",
-                  dbus_interface=DBUS_IFACE_STATUS_NAME)
-
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__queue_changed,
-                  signal_name="ContentQueueChanged",
-                  dbus_interface=DBUS_IFACE_STATUS_NAME)
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__transfer_started,
-                  signal_name="UploadStarted",
-                  dbus_interface=DBUS_IFACE_STATUS_NAME)
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__transfer_started,
-                  signal_name="DownloadStarted",
-                  dbus_interface=DBUS_IFACE_STATUS_NAME)
-
-            gobject.idle_add(self.__get_root)
-
-      def set_from_icon_name(self, icon):
-            """Handle fallbacks for setting our icon."""
-            pixbuf = self.__theme.load_icon(icon, self.__size,
-                                            gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-            self.set_from_pixbuf(pixbuf)
-
-      def set_visibility_config(self, visibility):
-            """Update the visibility configuration."""
-            self.__show_when = int(visibility)
-            self.__config.set("ubuntuone", "show_applet", str(self.__show_when))
-            self.update_visibility()
-
-      def set_connection_config(self, connect):
-            """Update the connection config."""
-            self.__config.set("ubuntuone", "connect", str(connect))
-
-      def __update_transfer_status(self, done=False):
-            """Update the status display."""
-            with self.__lock:
-                  text = _("Updating file %(transfers)d of %(total)d...") % \
-                           dict(transfers=self.__updating, total=self.__total)
-            label = self.__litems["status"].get_child()
-            if done:
-                  self.set_tooltip(_("Files updated."))
-                  self.set_from_icon_name("ubuntuone-client-idle")
-                  label.set_text(_("Your files are up to date."))
-            else:
-                  label.set_markup("<i>%s</i>" % text)
-
-      def __queue_changed(self, queue):
-            """Handle ContentQueueChanged."""
-            total = 0
-            d = queue.get('Download', None)
-            if d is not None:
-                  total += int(d.get('count', 0))
-            d = queue.get('Upload', None)
-            if d is not None:
-                  total += int(d.get('count', 0))
-            first = False
-            last = False
-            self.__visible = True
-            self.set_tooltip(_("Updating files..."))
-            self.update_visibility()
-            with self.__lock:
-                  if self.__total == 0:
-                        first = True
-                        last = False
-                  if self.__total != 0 and total == 0:
-                        first = False
-                        last = True
-                  self.__total = total + self.__updating
-            if first:
-                  self.set_from_icon_name("ubuntuone-client-updating")
-                  n = pynotify.Notification(
-                        _("Updating files..."),
-                        _("Ubuntu One is now updating your files."))
-                  pixbuf = self.__theme.load_icon(
-                        "ubuntuone-client-updating", NOTIFY_ICON_SIZE,
-                        gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-                  n.set_icon_from_pixbuf(pixbuf)
-                  n.show()
-            if last:
-                  if self.__last_id != 0:
-                        gobject.source_remove(self.__last_id)
-                        self.__last_id = 0
-                  self.__last_id = gobject.timeout_add_seconds(
-                        15, self.__updating_completed)
-
-      def __updating_completed(self):
-            """Timeout to avoid multiple started/finished notifications."""
-            really_last = False
-            n = None
-            with self.__lock:
-                  done = self.__total - self.__updating
-                  if done == 0:
-                        really_last = True
-            if not really_last:
-                  return False
-
-            with self.__lock:
-                  n = pynotify.Notification(
-                        _("Updating Finished"),
-                        ngettext("Ubuntu One finished updating %(total)d file.",
-                           "Ubuntu One finished updating %(total)d files.",
-                           self.__total) % { 'total' : self.__total })
-                  self.__total = 0
-                  self.__updating = 0
-            pixbuf = self.__theme.load_icon(
-                  "ubuntuone-client-updating", NOTIFY_ICON_SIZE,
-                  gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-            n.set_icon_from_pixbuf(pixbuf)
-            n.show()
-            self.__update_transfer_status(True)
-            return False
-
-      def __transfer_started(self, path):
-            """Handle the started signals."""
-            with self.__lock:
-                  self.__updating += 1
-            self.__update_transfer_status()
-
-      def update_visibility(self):
-            """Update the icon's visibility."""
-            if self.__visible_id != 0:
-                  gobject.source_remove(self.__visible_id)
-                  self.__visible_id = 0
-
-            if (self.__visible and self.__show_when != 2) or self.__fatal_error:
-                  self.set_visible(True)
-                  return
-
-            if self.__show_when == 2 and not self.__fatal_error:
-                  self.set_visible(False)
-                  return
-
-            # If the icon is shown, set up a timeout to hide it
-            if self.get_visible():
-                  self.__visible_id = gobject.timeout_add_seconds(
-                        30, self.__hide_icon)
-
-      def __status_changed(self, status):
-            """The sync daemon status changed."""
-            if self.__managed_dir is None:
-                gobject.idle_add(self.__get_root)
-
-            if self.__show_when != 0:
-                  self.__visible = False
-
-            state = status['name']
-
-            self.set_tooltip("Ubuntu One")
-
-            if self.__fatal_error and state != "UNKNOWN_ERROR":
-                  # Just blow your nose, and it's fixed, isn't it.
-                  self.__fatal_error = False
-                  self.__litems["connect"].set_sensitive(True)
-                  self.__litems["disconnect"].set_sensitive(True)
-
-            if state == "OFFLINE" or state.startswith("INIT") or \
-                      state.startswith("READY"):
-                  self.set_from_icon_name("ubuntuone-client-offline")
-                  self.set_tooltip(_("Disconnected"))
-                  self.__connected = False
-                  self.__visible = True
-
-            elif state == "CAPABILITIES_MISMATCH":
-                  self.__connected = False
-                  self.__visible = True
-                  # Pop up a notification
-                  n = pynotify.Notification(
-                        _("Capabilities Mismatch"),
-                        _("There was a capabilities mismatch while attempting "
-                          "to connect to the Ubuntu One server. You may "
-                          "have installed a newer version of the client, for "
-                          "which the server does not yet provide support. "
-                          "A new version of the server should be accessible "
-                          "soon. Please be patient while we update."))
-                  pixbuf = self.__theme.load_icon(
-                        "ubuntuone-client-error", NOTIFY_ICON_SIZE,
-                        gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-                  n.set_icon_from_pixbuf(pixbuf)
-                  n.set_urgency(pynotify.URGENCY_CRITICAL)
-                  n.show()
-                  # Set the tooltip and icon on the applet
-                  self.set_tooltip(_("Capabilities mismatch with server."))
-                  self.set_from_icon_name("ubuntuone-client-error")
-
-            elif state == "IDLE" or state.startswith("READING") or \
-                      state.startswith("SCANNING"):
-                  self.__connected = True
-                  if self.__show_when != 0:
-                        self.__visible = False
-
-            elif state == "AUTH_FAILED":
-                  self.__stop_syncdaemon()
-                  self.set_from_icon_name("ubuntuone-client-error")
-                  self.set_tooltip(_("Authentication failed"))
-                  self.__connected = False
-                  self.__visible = True
-
-                  def reauthorize_error(e):
-                        """Simple dbus error handler."""
-                        logger.error(_("Error clearing token: %s") % str(e))
-
-                  try:
-                        def token_cleared():
-                              """Do the next step."""
-                              if self.__main:
-                                    self.__main.check_for_token(True)
-
-                        client = self.__bus.get_object(DBUS_IFACE_AUTH_NAME,
-                            "/", follow_name_owner_changes=True)
-                        iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
-                        iface.clear_token(OAUTH_REALM, OAUTH_CONSUMER,
-                                          reply_handler=token_cleared,
-                                          error_handler=reauthorize_error)
-                  except DBusException, e:
-                        reauthorize_error(e)
-
-            elif state == "UNKNOWN_ERROR":
-                  # Disable some menu items
-                  self.__litems["connect"].set_sensitive(False)
-                  self.__litems["disconnect"].set_sensitive(False)
-                  # Change the behavior to file a bug
-                  if self.__fatal_error:
-                        return
-
-                  self.__fatal_error = True
-                  self.__visible = True
-
-                  # Pop up a notification
-                  n = pynotify.Notification(
-                        "Ubuntu One",
-                        _("There was a fatal error in Ubuntu One. " +
-                          "This may be a bug in the software. "
-                          "Please click on the Ubuntu One icon " +
-                          "in your panel to report a bug."))
-                  pixbuf = self.__theme.load_icon(
-                        "ubuntuone-client-error", NOTIFY_ICON_SIZE,
-                        gtk.ICON_LOOKUP_GENERIC_FALLBACK)
-                  n.set_icon_from_pixbuf(pixbuf)
-                  n.set_urgency(pynotify.URGENCY_CRITICAL)
-                  n.show()
-                  # Set the tooltip and icon on the applet
-                  self.set_tooltip(_("Fatal Error"))
-                  self.set_from_icon_name("ubuntuone-client-error")
-
-            else:
-                  self.__connected = True
-                  self.set_from_icon_name("ubuntuone-client-idle")
-                  if state.startswith("CONNECTING") or \
-                            state.startswith("START_CONNECTING") or \
-                            state.startswith("AUTHENTICATING") or \
-                            state.startswith("CONNECTED") or \
-                            state.startswith("START_CONNECTED"):
-                        self.set_from_icon_name("ubuntuone-client-idle")
-                        self.set_tooltip(_("Connecting"))
-                        self.__visible = True
-
-            self.update_visibility()
-
-            if self.__connected:
-                  self.__litems["connect"].hide()
-                  self.__litems["disconnect"].show()
-            else:
-                  self.__litems["connect"].show()
-                  self.__litems["disconnect"].hide()
-            self.__config.set("ubuntuone", "connected", self.__connected)
-
-      def __hide_icon(self):
-            """Timeout to hide tray icon after a period of inactivity."""
-            if self.__show_when == 0:
-                  return False
-
-            self.__visible = False
-            self.__visible_id = 0
-            self.set_visible(False)
-            return False
-
-      def __get_root(self):
-            """Method to get the rootdir from the sync daemon."""
-            # Get the managed root directory
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                                                 follow_name_owner_changes=True)
-            except DBusException:
-                  return False
-
-            iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-            def got_root(root):
-                  """We got the root dir."""
-                  self.__managed_dir = root
-                  if os.path.isdir(self.__managed_dir) and \
-                            os.access(self.__managed_dir,
-                                      os.F_OK | os.R_OK):
-                        self.__ritems["open"].set_sensitive(True)
-                        self.__add_to_places()
-                  else:
-                        self.__ritems["open"].set_sensitive(False)
-
-            def got_err(error):
-                  """Handle error from the dbus callback."""
-                  self.sd_dbus_error(error)
-                  self.__managed_dir = None
-                  self.__ritems["open"].set_sensitive(False)
-
-            iface.get_rootdir(reply_handler=got_root, error_handler=got_err)
-
-            # Now get the current status
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/status",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_STATUS_NAME)
-                  iface.current_status(reply_handler=self.__status_changed,
-                                       error_handler=self.sd_dbus_error)
-            except DBusException, e:
-                  self.sd_dbus_error(e)
-                  return False
-
-            return False
-
-      def __build_menus(self):
-            """Create the pop-up menu items."""
-            # Create the left-click menu
-            lmenu = gtk.Menu()
-
-            self.__litems["status"] = gtk.MenuItem(
-                  label=_("Your files are up to date."))
-            lmenu.append(self.__litems["status"])
-            self.__litems["status"].set_sensitive(False)
-            self.__litems["status"].show()
-
-            sep = gtk.SeparatorMenuItem()
-            lmenu.append(sep)
-            sep.show()
-
-            self.__litems["connect"] = gtk.ImageMenuItem(
-                  stock_id=gtk.STOCK_CONNECT)
-            lmenu.append(self.__litems["connect"])
-            self.__litems["connect"].connect("activate", self.__toggle_state)
-            self.__litems["connect"].show()
-
-            self.__litems["disconnect"] = gtk.ImageMenuItem(
-                  stock_id=gtk.STOCK_DISCONNECT)
-            lmenu.append(self.__litems["disconnect"])
-            self.__litems["disconnect"].connect("activate", self.__toggle_state)
-
-            lmenu.show()
-
-            # Create the right-click menu
-            rmenu = gtk.Menu()
-
-            self.__ritems["bug"] = gtk.MenuItem(label=_("_Report a Problem"))
-            rmenu.append(self.__ritems["bug"])
-            self.__ritems["bug"].connect("activate", self.__report_problem)
-            self.__ritems["bug"].show()
-
-            self.__ritems["open"] = gtk.MenuItem(label=_("_Open Folder"))
-            rmenu.append(self.__ritems["open"])
-            self.__ritems["open"].connect("activate", self.__open_folder)
-            self.__ritems["open"].set_sensitive(False)
-            self.__ritems["open"].show()
-
-            self.__ritems["web"] = gtk.MenuItem(label=_("_Go to Web"))
-            rmenu.append(self.__ritems["web"])
-            self.__ritems["web"].connect("activate", self.__open_website)
-            self.__ritems["web"].show()
-
-            self.__ritems["config"] = gtk.ImageMenuItem(
-                  stock_id=gtk.STOCK_PREFERENCES)
-            rmenu.append(self.__ritems["config"])
-            self.__ritems["config"].connect("activate", self.__open_config)
-            self.__ritems["config"].show()
-
-            sep = gtk.SeparatorMenuItem()
-            rmenu.append(sep)
-            sep.show()
-
-            self.__ritems["quit"] = gtk.ImageMenuItem(stock_id=gtk.STOCK_QUIT)
-            rmenu.append(self.__ritems["quit"])
-            self.__ritems["quit"].connect("activate", self.__quit_applet)
-            self.__ritems["quit"].show()
-
-            rmenu.show()
-
-            return lmenu, rmenu
-
-      def __size_changed(self, icon, size, data=None):
-            """Callback for when the size changes."""
-            if size < 24:
-                  self.__size = 16
-            elif size >= 24 and size < 32:
-                  self.__size = 24
-            elif size >= 32 and size < 48:
-                  self.__size = 32
-            elif size >= 48 and size < 64:
-                  self.__size = 48
-            else:
-                  self.__size = size
-
-      def __popup_menu(self, icon, button, timestamp, data=None):
-            """Pops up the context menu for the tray icon."""
-            if button == 0:
-                  self.__status_menu.popup(None, None,
-                                           gtk.status_icon_position_menu,
-                                           button, timestamp, icon)
-            else:
-                  self.__config_menu.popup(None, None,
-                                           gtk.status_icon_position_menu,
-                                           button, timestamp, icon)
-
-      def __stop_syncdaemon(self):
-            """Tell the syncdaemon to quit."""
-            def quit_error(e):
-                  """Just log and ignore."""
-                  logger.error(_("Quit Error: %s") % e.get_dbus_message())
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  iface.quit(reply_handler=dbus_async,
-                             error_handler=quit_error)
-            except DBusException, e:
-                  quit_error(e)
-
-      def __quit_applet(self, menuitem, data=None):
-            """Quit the daemon and closes the applet."""
-            self.__stop_syncdaemon()
-
-            from twisted.internet import reactor
-            reactor.stop()
-
-      def __toggle_state(self, menuitem, data=None):
-            """Connects or disconnects the storage sync process."""
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_SYNC_NAME)
-                  if self.__connected:
-                        iface.disconnect(reply_handler=dbus_async,
-                                         error_handler=self.sd_dbus_error)
-                  else:
-                        if self.__main and self.__main.authorized is False:
-                              self.__main.check_for_token(do_login=True)
-                        iface.connect(reply_handler=dbus_async,
-                                      error_handler=self.sd_dbus_error)
-            except DBusException, e:
-                  self.sd_dbus_error(e)
-
-            self.__config.set("ubuntuone", "connected", not self.__connected)
-            with open(CONF_FILE, "w+b") as f:
-                  self.__config.write(f)
-
-      def __open_folder(self, data=None):
-            """Opens the storage folder in the file manager."""
-            if not self.__managed_dir or not os.path.isdir(self.__managed_dir):
-                  return
-
-            folder = "file://%s" % quote(self.__managed_dir)
-            do_xdg_open(folder)
-
-      def __do_action(self, data=None):
-            """Handles the most appropriate action when the icon is clicked."""
-            if self.__fatal_error:
-                  self.__report_problem()
-                  self.__quit_applet(None)
-                  return
-
-            if self.__need_update:
-                  do_xdg_open("apt:ubuntuone-storage-protocol?refresh=yes")
-                  return
-
-            # Popup the status menu
-            self.emit("popup-menu", 0, gtk.get_current_event_time())
-
-      def __report_problem_real(self):
-            """Runs apport to report a problem against our code."""
-            args = ["ubuntu-bug", "ubuntuone-client"]
-            ret = subprocess.call(args, env=os.environ)
-            if ret != 0:
-                  logger.error(_("Failed to run 'ubuntu-bug'"))
-
-      def __report_problem(self, data=None):
-            """Pops another thread to run apport in."""
-            Thread(target=self.__report_problem_real, name="apport").start()
-
-      def __open_website(self, data=None, url=None):
-            """Opens the one.ubuntu.com web site."""
-            if url:
-                  do_xdg_open(url)
-            else:
-                  do_xdg_open("https://one.ubuntu.com/")
-
-
-      def __open_config(self, data=None):
-            """Opens the preferences dialog."""
-            do_config_open()
-
-      def __add_to_places(self):
-            """Add the managed directory to the .gtk-bookmarks file."""
-            # Only add once
-            if self.__config.getboolean("ubuntuone", "bookmarked"):
-                  return
-
-            path = os.path.join(os.path.expanduser("~"), ".gtk-bookmarks")
-            with open(path, "a+") as f:
-                  bookmarks_entry = "file://%s %s\n" % (
-                        quote(self.__managed_dir), BOOKMARK_NAME)
-                  in_file = False
-                  for line in f:
-                        if line == bookmarks_entry:
-                              in_file = True
-                  if not in_file:
-                        f.write(bookmarks_entry)
-
-            self.__config.set("ubuntuone", "bookmarked", "True")
-            with open(CONF_FILE, "w+b") as f:
-                  self.__config.write(f)
-
-      def sd_dbus_error(self, error):
-            """
-            Handle DBus errors for crucial syncdaemon calls,
-            and change the applet behavior slightly.
-            """
-            logger.error(_("DBus Error: %s") % error.get_dbus_message())
-            if self.__fatal_error:
-                  return
-
-            self.__fatal_error = True
-            self.__status_changed({'name' : 'UNKNOWN_ERROR'})
-
-
-class AppletConfig(dbus.service.Object):
-      """DBus Service object"""
-
-      def __init__(self, icon, *args, **kwargs):
-            """Initialize our magic."""
-            self.icon = icon
-            self.path = "/config"
-            self.bus = dbus.SessionBus()
-            bus_name = dbus.service.BusName(APPLET_BUS_NAME,
-                                            bus=self.bus)
-            dbus.service.Object.__init__(self, bus_name=bus_name,
-                                         object_path=self.path)
-
-      @dbus.service.method(APPLET_CONFIG_NAME,
-                           in_signature='i', out_signature='')
-      def set_visibility_config(self, visibility):
-            self.icon.set_visibility_config(visibility)
-
-      @dbus.service.method(APPLET_CONFIG_NAME,
-                           in_signature='i', out_signature='')
-      def set_connection_config(self, connect):
-            self.icon.set_connection_config(connect)
-
-
-if __name__ == "__main__":
-      gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
-      gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
-
-      # Register DBus service for making sure we run only one instance
-      bus = dbus.SessionBus()
-      if bus.request_name(APPLET_BUS_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE) == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
-            print _("Ubuntu One client applet already running, quitting")
-            do_config_open()
-            sys.exit(0)
-
-      gtk.rc_parse_string(RCSTYLE)
-
-      icon = AppletMain()
-      icon.main()

=== removed file 'bin/ubuntuone-client-preferences'
--- bin/ubuntuone-client-preferences	2009-12-07 17:35:00 +0000
+++ bin/ubuntuone-client-preferences	1970-01-01 00:00:00 +0000
@@ -1,360 +0,0 @@
-#!/usr/bin/python
-
-# ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
-#
-# Author: Rodney Dawes <[e-mail]>
-#
-# Copyright 2009 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/>.
-
-from __future__ import with_statement
-
-import pygtk
-pygtk.require('2.0')
-import gobject
-import gtk
-import os
-import gettext
-from ubuntuone import clientdefs
-
-import dbus.service
-from ConfigParser import ConfigParser
-from dbus.exceptions import DBusException
-from dbus.mainloop.glib import DBusGMainLoop
-from xdg.BaseDirectory import xdg_config_home
-
-DBusGMainLoop(set_as_default=True)
-
-_ = gettext.gettext
-
-APPLET_IFACE_NAME = "com.ubuntuone.ClientApplet"
-APPLET_IFACE_CONFIG_NAME = APPLET_IFACE_NAME + ".Config"
-
-DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
-DBUS_IFACE_CONFIG_NAME = DBUS_IFACE_NAME + ".Config"
-
-# Why thank you GTK+ for enforcing style-set and breaking API
-RCSTYLE = """
-style 'dialogs' {
-  GtkDialog::action-area-border = 12
-  GtkDialog::button-spacing = 6
-  GtkDialog::content-area-border = 0
-}
-widget_class '*Dialog*' style 'dialogs'
-"""
-
-CONF_FILE = os.path.join(xdg_config_home, "ubuntuone", "ubuntuone-client.conf")
-
-def dbus_async(*args):
-      """Simple handler to make dbus do stuff async."""
-      pass
-
-
-class AppletConfigDialog(gtk.Dialog):
-      """Preferences dialog."""
-
-      def __init__(self, config=None, *args, **kw):
-            """Initializes our config dialog."""
-            super(AppletConfigDialog, self).__init__(*args, **kw)
-            self.set_title(_("Ubuntu One Preferences"))
-            self.set_has_separator(False)
-            self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
-            self.set_default_response(gtk.RESPONSE_CLOSE)
-            self.set_icon_name("ubuntuone-client")
-
-            self.connect("close", self.__handle_response, gtk.RESPONSE_CLOSE)
-            self.connect("response", self.__handle_response)
-
-            self.config = config
-
-            self.bw_enabled = False
-            self.up_limit = 2097152
-            self.dn_limit = 2097152
-
-            self.__bus = dbus.SessionBus()
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.get_throttling_limits(
-                        reply_handler=self.__got_limits,
-                        error_handler=self.__dbus_error)
-                  iface.bandwidth_throttling_enabled(
-                        reply_handler=self.__got_enabled,
-                        error_handler=self.__dbus_error)
-            except DBusException, e:
-                  self.__dbus_error(e)
-
-            # Timeout ID to avoid spamming DBus from spinbutton changes
-            self.__update_id = 0
-
-            self.load_config()
-
-            self.__construct()
-
-      def load_config(self):
-            """Load the configuration, and initilize if empty."""
-            if not os.path.isdir(os.path.dirname(CONF_FILE)):
-                  os.makedirs(os.path.dirname(CONF_FILE))
-
-            self.config = ConfigParser()
-            self.config.read(CONF_FILE)
-
-            if not self.config.has_section("ubuntuone"):
-                  self.config.add_section("ubuntuone")
-
-            if not self.config.has_option("ubuntuone", "show_applet"):
-                  self.config.set("ubuntuone", "show_applet", "1")
-
-            if not self.config.has_option("ubuntuone", "connect"):
-                  self.config.set("ubuntuone", "connect", "0")
-
-            if not self.config.has_option("ubuntuone", "connected"):
-                  self.config.set("ubuntuone", "connected", "False")
-
-            if not os.path.exists(CONF_FILE):
-                  self.save_config()
-
-      def save_config(self):
-            """Write the configuration back to a file."""
-            with open(CONF_FILE, "w+b") as f:
-                  self.config.write(f)
-
-      def quit(self):
-            """Exit the main loop."""
-            gtk.main_quit()
-
-      def __dbus_error(self, error):
-            """Error getting throttling config."""
-            print repr(error)
-
-      def __got_limits(self, limits):
-            """Got the throttling limits."""
-            self.up_limit = int(limits['upload'])
-            self.dn_limit = int(limits['download'])
-            self.up_spin.set_value(self.up_limit / 1024)
-            self.dn_spin.set_value(self.dn_limit / 1024)
-
-      def __got_enabled(self, enabled):
-            """Got the throttling enabled config."""
-            self.bw_enabled = bool(enabled)
-            self.limit_check.set_active(self.bw_enabled)
-
-      def __update_bw_settings(self):
-            """Update the bandwidth throttling config in syncdaemon."""
-            self.bw_enabled = self.limit_check.get_active()
-            self.up_limit = self.up_spin.get_value_as_int() * 1024
-            self.dn_limit = self.dn_spin.get_value_as_int() * 1024
-
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
-                        reply_handler=dbus_async,
-                        error_handler=self.__dbus_error)
-                  if self.bw_enabled:
-                        iface.enable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__dbus_error)
-                  else:
-                        iface.disable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__dbus_error)
-            except DBusException, e:
-                  self.__dbus_error(e)
-
-      def __handle_response(self, dialog, response):
-            """Handle the dialog's response."""
-            self.hide()
-            self.config.set("ubuntuone", "show_applet",
-                            self.show_menu.get_active())
-            self.config.set("ubuntuone", "connect",
-                            self.conn_menu.get_active())
-
-            self.__update_bw_settings()
-            self.save_config()
-            gtk.main_quit()
-
-      def __show_menu_changed(self, menu, data=None):
-            """Update the config for showing the applet."""
-            value = menu.get_active()
-            self.config.set("ubuntuone", "show_applet", str(value))
-            try:
-                  client = self.__bus.get_object(APPLET_IFACE_NAME, "/config",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, APPLET_IFACE_CONFIG_NAME)
-                  iface.set_visibility_config(value, reply_handler=dbus_async,
-                                              error_handler=self.__dbus_error)
-            except DBusException, e:
-                  self.__dbus_error(e)
-
-      def __conn_menu_changed(self, menu, data=None):
-            """Update the config for showing the applet."""
-            value = menu.get_active()
-            self.config.set("ubuntuone", "connect", str(value))
-            try:
-                  client = self.__bus.get_object(APPLET_IFACE_NAME, "/config",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, APPLET_IFACE_CONFIG_NAME)
-                  iface.set_connection_config(value, reply_handler=dbus_async,
-                                              error_handler=self.__dbus_error)
-            except DBusException, e:
-                  self.__dbus_error(e)
-
-      def __bw_limit_toggled(self, button, data=None):
-            """Toggle the bw limit panel."""
-            self.bw_enabled = self.limit_check.get_active()
-            self.bw_table.set_sensitive(self.bw_enabled)
-            try:
-                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
-                                                 follow_name_owner_changes=True)
-                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
-                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
-                        reply_handler=dbus_async,
-                        error_handler=self.__dbus_error)
-                  if self.bw_enabled:
-                        iface.enable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__dbus_error)
-                  else:
-                        iface.disable_bandwidth_throttling(
-                              reply_handler=dbus_async,
-                              error_handler=self.__dbus_error)
-            except DBusException, e:
-                  self.__dbus_error(e)
-
-      def __spinner_changed(self, button, data=None):
-            """Remove timeout and add anew."""
-            if self.__update_id != 0:
-                  gobject.source_remove(self.__update_id)
-
-            self.__update_id = gobject.timeout_add_seconds(
-                  1, self.__update_bw_settings)
-
-      def __construct(self):
-            """Construct the dialog's layout."""
-            area = self.get_content_area()
-
-            vbox = gtk.VBox(spacing=12)
-            vbox.set_border_width(12)
-            area.add(vbox)
-            vbox.show()
-
-            # Put the first set of options in a table.
-            table = gtk.Table(rows=2, columns=2)
-            table.set_row_spacings(12)
-            table.set_col_spacings(6)
-            vbox.add(table)
-            table.show()
-
-            label = gtk.Label(_("_Show icon:"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            table.attach(label, 0, 1, 0, 1)
-            label.show()
-
-            self.show_menu = gtk.combo_box_new_text()
-            self.show_menu.connect("changed", self.__show_menu_changed)
-            label.set_mnemonic_widget(self.show_menu)
-            self.show_menu.append_text(_("Always"))
-            self.show_menu.append_text(_("When updating"))
-            self.show_menu.append_text(_("Never"))
-            self.show_menu.set_active(self.config.getint("ubuntuone",
-                                                         "show_applet"))
-            table.attach(self.show_menu, 1, 2, 0, 1)
-            self.show_menu.show()
-
-            label = gtk.Label(_("Connect on start:"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            table.attach(label, 0, 1, 1, 2)
-            label.show()
-
-            self.conn_menu = gtk.combo_box_new_text()
-            self.conn_menu.connect("changed", self.__conn_menu_changed)
-            label.set_mnemonic_widget(self.conn_menu)
-            self.conn_menu.append_text(_("Automatically"))
-            self.conn_menu.append_text(_("Remember last"))
-            self.conn_menu.append_text(_("Never"))
-            self.conn_menu.set_active(self.config.getint("ubuntuone",
-                                                         "connect"))
-            table.attach(self.conn_menu, 1, 2, 1, 2)
-            self.conn_menu.show()
-
-            # Bandwidth limiting
-            self.limit_check = gtk.CheckButton(_("_Limit Bandwidth Usage"))
-            self.limit_check.connect("toggled", self.__bw_limit_toggled)
-            vbox.add(self.limit_check)
-            self.limit_check.show()
-
-            hbox = gtk.HBox(spacing=12)
-            vbox.add(hbox)
-            hbox.show()
-
-            label = gtk.Label()
-            hbox.add(label)
-            label.show()
-
-            # Now put the bw limit bits in a table too
-            self.bw_table = gtk.Table(rows=2, columns=2)
-            self.bw_table.set_row_spacings(6)
-            self.bw_table.set_col_spacings(6)
-            self.bw_table.set_sensitive(False)
-            hbox.add(self.bw_table)
-            self.bw_table.show()
-
-            # Upload speed
-            label = gtk.Label(_("Maximum _upload speed (KB/s):"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            self.bw_table.attach(label, 0, 1, 0, 1)
-            label.show()
-
-            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
-                                        step_incr=64.0, page_incr=128.0)
-            self.up_spin = gtk.SpinButton(adjustment)
-            self.up_spin.connect("value-changed", self.__spinner_changed)
-            label.set_mnemonic_widget(self.up_spin)
-            self.bw_table.attach(self.up_spin, 1, 2, 0, 1)
-            self.up_spin.show()
-
-            # Download speed
-            label = gtk.Label(_("Maximum _download speed (KB/s):"))
-            label.set_use_underline(True)
-            label.set_alignment(0, 0.5)
-            self.bw_table.attach(label, 0, 1, 1, 2)
-            label.show()
-            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
-                                        step_incr=64.0, page_incr=128.0)
-            self.dn_spin = gtk.SpinButton(adjustment)
-            self.dn_spin.connect("value-changed", self.__spinner_changed)
-            label.set_mnemonic_widget(self.dn_spin)
-            self.bw_table.attach(self.dn_spin, 1, 2, 1, 2)
-            self.dn_spin.show()
-
-
-if __name__ == "__main__":
-      gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
-      gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
-
-      gtk.rc_parse_string(RCSTYLE)
-
-      try:
-            dialog = AppletConfigDialog()
-            dialog.show()
-            gtk.main()
-      except KeyboardInterrupt:
-            pass

=== added file 'bin/ubuntuone-login'
--- bin/ubuntuone-login	1970-01-01 00:00:00 +0000
+++ bin/ubuntuone-login	2010-02-18 00:10:25 +0000
@@ -0,0 +1,226 @@
+#!/usr/bin/python
+
+# ubuntuone-login - Client side log-in utility for Ubuntu One
+#
+# Author: Rodney Dawes <[e-mail]>
+#
+# Copyright 2009 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/>.
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import pango
+import sys
+import gettext
+from ubuntuone import clientdefs
+
+import dbus.service
+
+from dbus.mainloop.glib import DBusGMainLoop
+from ubuntuone.oauthdesktop.main import Login
+
+from ubuntuone.oauthdesktop.logger import setupLogging
+logger = setupLogging("ubuntuone-login")
+
+DBusGMainLoop(set_as_default=True)
+
+_ = gettext.gettext
+ngettext = gettext.ngettext
+
+DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
+
+OAUTH_REALM = "https://ubuntuone.com"
+OAUTH_CONSUMER = "ubuntuone"
+
+NOTIFY_ICON_SIZE = 48
+
+# Why thank you GTK+ for enforcing style-set and breaking API
+RCSTYLE = """
+style 'dialogs' {
+  GtkDialog::action-area-border = 12
+  GtkDialog::button-spacing = 6
+  GtkDialog::content-area-border = 0
+}
+widget_class '*Dialog*' style 'dialogs'
+"""
+
+
+class LoginMain(object):
+    """Main login manager process class."""
+
+    def __init__(self, *args, **kw):
+        """Initializes the child threads and dbus monitor."""
+        gtk.rc_parse_string(RCSTYLE)
+
+        logger.info(_("Starting Ubuntu One login manager version %s") %
+                    clientdefs.VERSION)
+
+        self.__bus = dbus.SessionBus()
+
+    def _connect_dbus_signals(self):
+        """Set up some signal handlers for DBus signals."""
+        self.__bus.add_signal_receiver(
+              handler_function=self.new_credentials,
+              signal_name="NewCredentials",
+              dbus_interface=DBUS_IFACE_AUTH_NAME)
+        self.__bus.add_signal_receiver(
+              handler_function=self.auth_denied,
+              signal_name="AuthorizationDenied",
+              dbus_interface=DBUS_IFACE_AUTH_NAME)
+        self.__bus.add_signal_receiver(
+              handler_function=self.got_oauth_error,
+              signal_name="OAuthError",
+              dbus_interface=DBUS_IFACE_AUTH_NAME)
+
+
+    def new_credentials(self, realm=None, consumer_key=None, sender=None):
+        """Signal callback for when we get new credentials."""
+        self.set_up_desktopcouch_pairing(consumer_key)
+
+    def auth_denied(self):
+        """Signal callback for when auth was denied by user."""
+        logger.info(_("Access to Ubuntu One was denied."))
+
+        from twisted.internet import reactor
+        reactor.stop()
+
+    def got_oauth_error(self, message=None):
+        """Signal callback for when an OAuth error occured."""
+        def dialog_response(dialog, response):
+            """Handle the dialog closing."""
+            dialog.destroy()
+
+        if message:
+            logger.error(message)
+            dialog = gtk.Dialog(title=_("Ubuntu One: Error"),
+                                flags=gtk.DIALOG_NO_SEPARATOR,
+                                buttons=(gtk.STOCK_CLOSE,
+                                         gtk.RESPONSE_CLOSE))
+            dialog.set_default_response(gtk.RESPONSE_CLOSE)
+            dialog.set_icon_name("ubuntuone-client")
+
+            area = dialog.get_content_area()
+
+            hbox = gtk.HBox(spacing=12)
+            hbox.set_border_width(12)
+            area.pack_start(hbox)
+            hbox.show()
+
+            image = gtk.Image()
+            image.set_from_icon_name("dialog-error", gtk.ICON_SIZE_DIALOG)
+            image.set_alignment(0.5, 0.0)
+            image.show()
+            hbox.pack_start(image, False, False)
+
+            vbox = gtk.VBox(spacing=12)
+            vbox.show()
+            hbox.pack_start(vbox)
+
+            label = gtk.Label("<b>%s</b>" % _("Authorization Error"))
+            label.set_use_markup(True)
+            label.set_alignment(0.0, 0.5)
+            label.show()
+            vbox.pack_start(label, False, False)
+
+            label = gtk.Label(message)
+            label.set_line_wrap(True)
+            label.set_max_width_chars(64)
+            label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
+            label.set_alignment(0.0, 0.0)
+            label.show()
+            vbox.pack_start(label, True, True)
+
+            dialog.connect('close', dialog_response, gtk.RESPONSE_CLOSE)
+            dialog.connect('response', dialog_response)
+
+            dialog.show()
+        else:
+            logger.error(_("Got an OAuth error with no message."))
+
+    def set_up_desktopcouch_pairing(self, consumer_key):
+        """Add a pairing record between desktopcouch and Ubuntu One"""
+        try:
+            from desktopcouch.pair.couchdb_pairing.couchdb_io import \
+                 put_static_paired_service
+            from desktopcouch.records.server import CouchDatabase
+        except ImportError:
+            # desktopcouch is not installed
+            logger.debug(_("Not adding desktopcouch pairing since"
+                " desktopcouch is not installed"))
+            return
+        # Check whether there is already a record of the Ubuntu One service
+        db = CouchDatabase("management", create=True)
+        if not db.view_exists("ubuntu_one_pair_record","ubuntu_one_pair_record"):
+            map_js = """function(doc) {
+                if (doc.service_name == "ubuntuone") {
+                    if (doc.application_annotations &&
+                        doc.application_annotations["Ubuntu One"] &&
+                        doc.application_annotations["Ubuntu One"]["private_application_annotations"] &&
+                        doc.application_annotations["Ubuntu One"]["private_application_annotations"]["deleted"]) {
+                        emit(doc._id, 1);
+                    } else {
+                        emit(doc._id, 0)
+                    }
+                }
+            }"""
+            db.add_view("ubuntu_one_pair_record", map_js, None,
+                "ubuntu_one_pair_record")
+        results = db.execute_view("ubuntu_one_pair_record",
+            "ubuntu_one_pair_record")
+        found = False
+        # Results should contain either one row or no rows
+        # If there is one row, its value will be 0, meaning that there is
+        #   already an Ubuntu One pairing record, or 1, meaning that there
+        #   was an Ubuntu One pairing record but it has since been unpaired
+        # Only create a new record if there is not one already. Specifically,
+        #   do not add the record if there is a deleted one, as this means
+        #   that the user explicitly unpaired it!
+        for row in results:
+            found = True
+            if row.value == 1:
+                logger.debug(_("Not adding desktopcouch pairing since"
+                " the user has explicitly unpaired with Ubuntu One"))
+            else:
+                logger.debug(_("Not adding desktopcouch pairing since"
+                " we are already paired"))
+        if not found:
+            put_static_paired_service(None, "ubuntuone")
+            logger.debug(_("Pairing desktopcouch with Ubuntu One"))
+
+    def main(self):
+        """Starts the gtk main loop."""
+        self._connect_dbus_signals()
+
+        from twisted.internet import reactor
+        reactor.run()
+
+
+if __name__ == "__main__":
+    gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
+    gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
+
+    # Register DBus service for making sure we run only one instance
+    bus = dbus.SessionBus()
+    if bus.request_name(DBUS_IFACE_AUTH_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE) == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
+        print _("Ubuntu One login manager already running, quitting")
+        sys.exit(0)
+
+    from twisted.internet import gtk2reactor
+    gtk2reactor.install()
+
+    login = Login(dbus.service.BusName(DBUS_IFACE_AUTH_NAME,
+                                       bus=dbus.SessionBus()))
+    manager = LoginMain()
+    manager.main()

=== added file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	1970-01-01 00:00:00 +0000
+++ bin/ubuntuone-preferences	2010-02-18 00:10:25 +0000
@@ -0,0 +1,549 @@
+#!/usr/bin/python
+
+# ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
+#
+# Author: Rodney Dawes <[e-mail]>
+#
+# Copyright 2009 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/>.
+
+from __future__ import division
+
+import pygtk
+pygtk.require('2.0')
+import gobject
+import gtk
+import os
+import gettext
+import gnomekeyring
+import httplib2
+import simplejson
+from oauth import oauth
+from ubuntuone import clientdefs
+
+import dbus.service
+from ConfigParser import ConfigParser
+from dbus.exceptions import DBusException
+from dbus.mainloop.glib import DBusGMainLoop
+from xdg.BaseDirectory import xdg_config_home
+
+DBusGMainLoop(set_as_default=True)
+
+_ = gettext.gettext
+
+DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
+DBUS_IFACE_CONFIG_NAME = DBUS_IFACE_NAME + ".Config"
+
+DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
+DBUS_IFACE_AUTH_PATH = "/"
+
+# Why thank you GTK+ for enforcing style-set and breaking API
+RCSTYLE = """
+style 'dialogs' {
+  GtkDialog::action-area-border = 12
+  GtkDialog::button-spacing = 6
+  GtkDialog::content-area-border = 0
+}
+widget_class '*Dialog*' style 'dialogs'
+"""
+
+def dbus_async(*args):
+      """Simple handler to make dbus do stuff async."""
+      pass
+
+
+class UbuntuOneDialog(gtk.Dialog):
+      """Preferences dialog."""
+
+      def __init__(self, config=None, *args, **kw):
+            """Initializes our config dialog."""
+            super(UbuntuOneDialog, self).__init__(*args, **kw)
+            self.set_title(_("Ubuntu One Preferences"))
+            self.set_has_separator(False)
+            self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
+            self.set_default_response(gtk.RESPONSE_CLOSE)
+            self.set_icon_name("ubuntuone")
+
+            self.connect("close", self.__handle_response, gtk.RESPONSE_CLOSE)
+            self.connect("response", self.__handle_response)
+
+            self.bw_enabled = False
+            self.up_limit = 2097152
+            self.dn_limit = 2097152
+
+            self.__bus = dbus.SessionBus()
+            self.keyring = gnomekeyring
+
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
+                                                 follow_name_owner_changes=True)
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.get_throttling_limits(
+                        reply_handler=self.__got_limits,
+                        error_handler=self.__dbus_error)
+                  iface.bandwidth_throttling_enabled(
+                        reply_handler=self.__got_enabled,
+                        error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+            # Timeout ID to avoid spamming DBus from spinbutton changes
+            self.__update_id = 0
+
+            self.__construct()
+
+      def quit(self):
+            """Exit the main loop."""
+            gtk.main_quit()
+
+      def __dbus_error(self, error):
+            """Error getting throttling config."""
+            print repr(error)
+
+      def __got_limits(self, limits):
+            """Got the throttling limits."""
+            self.up_limit = int(limits['upload'])
+            self.dn_limit = int(limits['download'])
+            self.up_spin.set_value(self.up_limit / 1024)
+            self.dn_spin.set_value(self.dn_limit / 1024)
+
+      def __got_enabled(self, enabled):
+            """Got the throttling enabled config."""
+            self.bw_enabled = bool(enabled)
+            self.limit_check.set_active(self.bw_enabled)
+
+      def __update_bw_settings(self):
+            """Update the bandwidth throttling config in syncdaemon."""
+            self.bw_enabled = self.limit_check.get_active()
+            self.up_limit = self.up_spin.get_value_as_int() * 1024
+            self.dn_limit = self.dn_spin.get_value_as_int() * 1024
+
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
+                                                 follow_name_owner_changes=True)
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
+                        reply_handler=dbus_async,
+                        error_handler=self.__dbus_error)
+                  if self.bw_enabled:
+                        iface.enable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+                  else:
+                        iface.disable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __handle_response(self, dialog, response):
+            """Handle the dialog's response."""
+            self.hide()
+            self.__update_bw_settings()
+            gtk.main_quit()
+
+      def __bw_limit_toggled(self, button, data=None):
+            """Toggle the bw limit panel."""
+            self.bw_enabled = self.limit_check.get_active()
+            self.bw_table.set_sensitive(self.bw_enabled)
+            try:
+                  client = self.__bus.get_object(DBUS_IFACE_NAME, "/config",
+                                                 follow_name_owner_changes=True)
+                  iface = dbus.Interface(client, DBUS_IFACE_CONFIG_NAME)
+                  iface.set_throttling_limits(self.dn_limit, self.up_limit,
+                        reply_handler=dbus_async,
+                        error_handler=self.__dbus_error)
+                  if self.bw_enabled:
+                        iface.enable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+                  else:
+                        iface.disable_bandwidth_throttling(
+                              reply_handler=dbus_async,
+                              error_handler=self.__dbus_error)
+            except DBusException, e:
+                  self.__dbus_error(e)
+
+      def __spinner_changed(self, button, data=None):
+            """Remove timeout and add anew."""
+            if self.__update_id != 0:
+                  gobject.source_remove(self.__update_id)
+
+            self.__update_id = gobject.timeout_add_seconds(
+                  1, self.__update_bw_settings)
+
+      def _format_for_gb_display(self, bytes):
+            """Format bytes into reasonable gb display."""
+            gb = bytes / 1024 / 1024 / 1024
+            if gb < 1.0:
+                  mb = bytes / 1024 / 1024
+                  if mb < 1.0:
+                        return (bytes / 1024, 'KB')
+                  return (mb, 'MB')
+            return (gb, 'GB')
+
+      def update_quota_display(self, used, total):
+            """Update the quota display."""
+            percent = (float(used) / float(total)) * 100
+            real_used, real_type = self._format_for_gb_display(used)
+            self.usage_label.set_text(
+                  _("%(used)0.1f %(type)s Used (%(percent)0.1f%%)") % {
+                        'used' : real_used,
+                        'type' : real_type,
+                        'percent' : percent })
+            self.usage_graph.set_fraction(percent / 100)
+
+      def request_REST_info(self, url, method):
+            """Make a REST request and return the resulting dict, or None."""
+            consumer = oauth.OAuthConsumer("ubuntuone", "hammertime")
+            items = []
+            items = self.keyring.find_items_sync(
+                  gnomekeyring.ITEM_GENERIC_SECRET,
+                  {'ubuntuone-realm': "https://ubuntuone.com",
+                   'oauth-consumer-key': consumer.key})
+            token = oauth.OAuthToken.from_string(items[0].secret)
+            request = oauth.OAuthRequest.from_consumer_and_token(
+                  http_url=url, http_method=method, oauth_consumer=consumer,
+                  token=token)
+            request.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(),
+                                 consumer, token)
+            client = httplib2.Http()
+            headers = {}
+            headers.update(request.to_header())
+            resp, content = client.request(url, method, headers=headers)
+            if resp['status'] == '200':
+                  return simplejson.loads(content)
+                  # FIXME: Log json parsing failures
+            else:
+                  # FIXME: Log errors
+                  return None
+
+      def request_quota_info(self):
+            """Request new quota info from server, and update display."""
+            quota = self.request_REST_info('https://one.ubuntu.com/api/quota/',
+                                           'GET')
+            if quota:
+                  self.update_quota_display(quota['used'], quota['total'])
+
+      def request_account_info(self):
+            """Request account info from server, and update display."""
+            user = self.request_REST_info('https://one.ubuntu.com/api/account/',
+                                          'GET')
+            if user:
+                  self.name_label.set_text(user['nickname'])
+                  self.user_label.set_text(user['username'])
+                  self.mail_label.set_text(user['email'])
+
+      def toggle_db_sync(self, dbname, disable=False):
+            """
+            Toggle whether a db in desktopcouch is synchronized to the
+            Ubuntu One couchdb server.
+            """
+            # FIXME: Actually enable/disable the dbs if desktopcouch exists
+
+      def __db_check_toggled(self, checkbutton):
+            """Handle toggling a desktopcouch service toggling."""
+            dbname = checkbutton.get_data('dbname')
+            self.toggle_db_sync(dbname, not checkbutton.get_active())
+
+      def __files_check_toggled(self, checkbutton):
+            """Handle toggling the files service."""
+            enable = checkbutton.get_active()
+            if enable:
+                  self.music_check.set_sensitive(True)
+                  if self.music_check.get_active():
+                        self.__music_check_toggled(self.music_check)
+            else:
+                  self.music_check.set_sensitive(False)
+            # FIXME: Actually stop or start ubuntuone-syncdaemon
+
+      def __music_check_toggled(self, checkbutton):
+            """Handle toggling the music download service."""
+            if not self.files_check.get_active():
+                  return
+            # FIXME: Actually subscribe or unsubscribe to the UDF
+
+      def __construct(self):
+            """Construct the dialog's layout."""
+            area = self.get_content_area()
+
+            vbox = gtk.VBox(spacing=12)
+            vbox.set_border_width(12)
+            area.add(vbox)
+            vbox.show()
+
+            # Usage text/progress bar
+            hbox = gtk.HBox(homogeneous=True)
+            vbox.pack_start(hbox, False, False)
+            hbox.show()
+
+            label = gtk.Label("")
+            hbox.add(label)
+            label.show()
+
+            rbox = gtk.VBox(spacing=2)
+            hbox.pack_end(rbox)
+            rbox.show()
+
+            self.usage_label = gtk.Label("")
+            self.usage_label.set_alignment(0.5, 0.5)
+            rbox.add(self.usage_label)
+            self.usage_label.show()
+
+            self.usage_graph = gtk.ProgressBar()
+            rbox.add(self.usage_graph)
+            self.usage_graph.show()
+
+            self.update_quota_display(0, 2)
+
+            # Notebook
+            self.notebook = gtk.Notebook()
+            vbox.add(self.notebook)
+            self.notebook.show()
+
+            # Account tab
+            account = gtk.VBox(spacing=12)
+            account.set_border_width(6)
+            self.notebook.append_page(account)
+            self.notebook.set_tab_label_text(account, _("Account"))
+            account.show()
+
+            # User info in account tab
+            table = gtk.Table(rows=3, columns=2)
+            table.set_row_spacings(6)
+            table.set_col_spacings(6)
+            account.pack_start(table, False, False)
+            table.show()
+
+            label = gtk.Label(_("_Name:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 0, 1)
+            label.show()
+
+            self.name_label = gtk.Label("")
+            self.name_label.set_use_underline(True)
+            self.name_label.set_alignment(0.0, 0.5)
+            table.attach(self.name_label, 1, 2, 0, 1)
+            self.name_label.show()
+
+            label = gtk.Label(_("_Username:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 1, 2)
+            label.show()
+
+            self.user_label = gtk.Label("")
+            self.user_label.set_use_underline(True)
+            self.user_label.set_alignment(0.0, 0.5)
+            table.attach(self.user_label, 1, 2, 1, 2)
+            self.user_label.show()
+
+            label = gtk.Label(_("_E-mail:"))
+            label.set_use_underline(True)
+            label.set_alignment(0.0, 0.5)
+            table.attach(label, 0, 1, 2, 3)
+            label.show()
+
+            self.mail_label = gtk.Label("")
+            self.mail_label.set_use_underline(True)
+            self.mail_label.set_alignment(0.0, 0.5)
+            table.attach(self.mail_label, 1, 2, 2, 3)
+            self.mail_label.show()
+
+            # Devices tab
+            devices = gtk.VBox(spacing=12)
+            devices.set_border_width(6)
+            self.notebook.append_page(devices)
+            self.notebook.set_tab_label_text(devices, _("Devices"))
+            devices.show()
+
+            # Bandwidth limiting
+            self.limit_check = gtk.CheckButton(_("_Limit Bandwidth Usage"))
+            self.limit_check.connect("toggled", self.__bw_limit_toggled)
+            devices.pack_start(self.limit_check, False, False)
+            self.limit_check.show()
+
+            hbox = gtk.HBox(spacing=12)
+            devices.pack_start(hbox, False, False)
+            hbox.show()
+
+            label = gtk.Label()
+            hbox.pack_start(label, False, False)
+            label.show()
+
+            # Now put the bw limit bits in a table too
+            self.bw_table = gtk.Table(rows=2, columns=2)
+            self.bw_table.set_row_spacings(6)
+            self.bw_table.set_col_spacings(6)
+            self.bw_table.set_sensitive(False)
+            hbox.pack_start(self.bw_table, False, False)
+            self.bw_table.show()
+
+            # Upload speed
+            label = gtk.Label(_("Maximum _upload speed (KB/s):"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            self.bw_table.attach(label, 0, 1, 0, 1)
+            label.show()
+
+            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
+                                        step_incr=64.0, page_incr=128.0)
+            self.up_spin = gtk.SpinButton(adjustment)
+            self.up_spin.connect("value-changed", self.__spinner_changed)
+            label.set_mnemonic_widget(self.up_spin)
+            self.bw_table.attach(self.up_spin, 1, 2, 0, 1)
+            self.up_spin.show()
+
+            # Download speed
+            label = gtk.Label(_("Maximum _download speed (KB/s):"))
+            label.set_use_underline(True)
+            label.set_alignment(0, 0.5)
+            self.bw_table.attach(label, 0, 1, 1, 2)
+            label.show()
+            adjustment = gtk.Adjustment(value=2048.0, lower=0.0, upper=4096.0,
+                                        step_incr=64.0, page_incr=128.0)
+            self.dn_spin = gtk.SpinButton(adjustment)
+            self.dn_spin.connect("value-changed", self.__spinner_changed)
+            label.set_mnemonic_widget(self.dn_spin)
+            self.bw_table.attach(self.dn_spin, 1, 2, 1, 2)
+            self.dn_spin.show()
+
+            # Services tab
+            services = gtk.VBox(spacing=12)
+            services.set_border_width(6)
+            self.notebook.append_page(services)
+            self.notebook.set_tab_label_text(services, _("Services"))
+            # FIXME: These are all disabled for the moment
+            services.set_sensitive(False)
+            services.show()
+
+            self.bookmarks_check = gtk.CheckButton(_("_Bookmarks"))
+            self.bookmarks_check.set_data('dbname', 'bookmarks')
+            self.bookmarks_check.connect('toggled', self.__db_check_toggled)
+            services.pack_start(self.bookmarks_check, False, False)
+            self.bookmarks_check.show()
+
+            self.abook_check = gtk.CheckButton(_("C_ontacts"))
+            self.abook_check.set_data('dbname', 'contacts')
+            self.abook_check.connect('toggled', self.__db_check_toggled)
+            services.pack_start(self.abook_check, False, False)
+            self.abook_check.show()
+
+            fbox = gtk.VBox(spacing=6)
+            services.pack_start(fbox, False, False)
+            fbox.show()
+
+            self.files_check = gtk.CheckButton(_("_File Synchronization"))
+            self.files_check.set_active(True)
+            self.files_check.connect('toggled', self.__files_check_toggled)
+            fbox.pack_start(self.files_check, False, False)
+            self.files_check.show()
+
+            alignment = gtk.Alignment(0.0, 0.5)
+            alignment.set_padding(0, 0, 12, 0)
+            fbox.pack_start(alignment, False, False)
+            alignment.show()
+
+            self.music_check = gtk.CheckButton(_("_Music Download"))
+            self.music_check.set_active(True)
+            self.music_check.connect('toggled', self.__music_check_toggled)
+            alignment.add(self.music_check)
+            self.music_check.show()
+
+class UbuntuoneLoginHandler(object):
+      """Class to handle registration/login, in case we aren't already."""
+
+      def __init__(self, *args, **kw):
+            self.bus = dbus.SessionBus()
+
+            self.newcreds = None
+            self.oautherr = None
+            self.authdeny = None
+
+      def got_newcredentials(self, realm, consumer_key):
+            """Show our dialog, since we can do stuff now."""
+            self.disconnect_signal_handlers()
+            dialog = UbuntuOneDialog()
+            dialog.request_quota_info()
+            dialog.request_account_info()
+            dialog.show()
+
+      def got_oautherror(self, message=None):
+            """Got an error during oauth."""
+            gtk.main_quit()
+
+      def got_authdenied(self):
+            """User denied access."""
+            gtk.main_quit()
+
+      def got_dbus_error(self, error):
+            """Got a DBusError."""
+            gtk.main_quit()
+
+      def register_signal_handlers(self):
+            """Register the dbus signal handlers."""
+            self.newcreds = self.bus.add_signal_receiver(
+                  handler_function=self.got_newcredentials,
+                  signal_name='NewCredentials',
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+            self.oautherr = self.bus.add_signal_receiver(
+                  handler_function=self.got_oautherror,
+                  signal_name='OAuthError',
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+            self.authdeny = self.bus.add_signal_receiver(
+                  handler_function=self.got_authdenied,
+                  signal_name='AuthorizationDenied',
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+
+      def disconnect_signal_handlers(self):
+            """Disconnect the dbus signal handlers, so we don't break."""
+            self.bus.remove_signal_receiver(
+                  self.newcreds,
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+            self.bus.remove_signal_receiver(
+                  self.oautherr,
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+            self.bus.remove_signal_receiver(
+                  self.authdeny,
+                  dbus_interface=DBUS_IFACE_AUTH_NAME)
+
+      def do_login_check(self):
+            """Log in to U1 or validate that we already are."""
+            try:
+                  client = self.bus.get_object(DBUS_IFACE_AUTH_NAME,
+                                               DBUS_IFACE_AUTH_PATH,
+                                               follow_name_owner_changes=True)
+                  iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
+                  iface.login('https://ubuntuone.com', 'ubuntuone',
+                              reply_handler=dbus_async,
+                              error_handler=self.got_dbus_error)
+            except DBusException, e:
+                  self.got_dbus_error(e)
+
+
+if __name__ == "__main__":
+      gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
+      gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
+
+      gtk.rc_parse_string(RCSTYLE)
+      gobject.set_application_name("Ubuntu One")
+
+      try:
+            login = UbuntuoneLoginHandler()
+            login.register_signal_handlers()
+            login.do_login_check()
+            gtk.main()
+      except KeyboardInterrupt:
+            pass

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2009-09-28 18:15:00 +0000
+++ bin/ubuntuone-syncdaemon	2010-02-18 00:10:25 +0000
@@ -31,7 +31,7 @@
 import sys
 import shutil
 
-from ubuntuone.syncdaemon import dbus_interface, logger
+from ubuntuone.syncdaemon import dbus_interface, logger, config
 from ubuntuone.syncdaemon.config import (
     get_config_files,
     get_parsers,
@@ -75,14 +75,15 @@
         configs.append(args.pop(0))
     if len(configs) == 0:
         configs.extend(get_config_files())
-    (parser, options, argv) = configglue(file(configs[0]), *configs[1:], 
-                               args=args, usage=usage,
-                               extra_parsers=get_parsers())
+    (parser, options, argv) = config.configglue(file(configs[0]), *configs[1:],
+                               args=args, usage=usage)
 
     if options.debug:
         logger.set_debug('stdout file')
     else:
-        logger.set_level(options.log_level)
+        logger.configure_logging(options.logging_level, 
+                                 options.logging_file_size,
+                                 options.logging_backup_count)
 
     # check we're not running as root, or have explicitely and in
     # length expressed our desire to do so

=== modified file 'config.guess'
--- config.guess	2009-07-27 16:00:00 +0000
+++ config.guess	2010-02-18 00:10:25 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -656,7 +656,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -822,6 +822,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -882,40 +885,17 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -947,7 +927,7 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
@@ -1001,14 +981,6 @@
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1074,7 +1046,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1154,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)

=== modified file 'config.sub'
--- config.sub	2009-07-27 16:00:00 +0000
+++ config.sub	2010-02-18 00:10:25 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -153,6 +153,9 @@
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -467,6 +470,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -1260,7 +1267,7 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1613,7 +1620,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

=== modified file 'configure'
--- configure	2009-12-07 17:35:00 +0000
+++ configure	2010-02-18 00:10:25 +0000
@@ -1,10 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for ubuntuone-client 1.1.0.
+# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.1.2.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -673,7 +675,8 @@
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -695,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='ubuntuone-client'
 PACKAGE_TARNAME='ubuntuone-client'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='ubuntuone-client 1.1.0'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='ubuntuone-client 1.1.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -756,6 +759,8 @@
 PYTHON_PREFIX
 PYTHON_VERSION
 PYTHON
+LOG_FILE_SIZE
+LOG_LEVEL
 ENABLE_RENDERING_FALSE
 ENABLE_RENDERING_TRUE
 ICONTOOL_RENDER
@@ -911,6 +916,7 @@
 enable_libtool_lock
 enable_nls
 enable_rendering
+enable_debug
 enable_pycentral
 with_protocol
 with_dbus_services
@@ -1470,7 +1476,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ubuntuone-client 1.1.0 to adapt to many kinds of systems.
+\`configure' configures ubuntuone-client 1.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1541,7 +1547,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ubuntuone-client 1.1.0:";;
+     short | recursive ) echo "Configuration of ubuntuone-client 1.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1557,8 +1563,9 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
-  --enable-rendering      Enable icon rendering default=auto
-  --enable-pycentral      Enable usage of pycentral default=disabled
+  --enable-rendering      Enable icon rendering [default=auto]
+  --enable-debug          Enable debug logging by default [default=auto]
+  --enable-pycentral      Enable usage of pycentral [default=disabled]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1566,7 +1573,7 @@
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-protocol         Specify path to storage protocol default=auto
+  --with-protocol         Specify path to storage protocol [default=auto]
   --with-dbus-services=<dir>
                           where D-BUS services directory is
 
@@ -1576,7 +1583,7 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
@@ -1653,8 +1660,8 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ubuntuone-client configure 1.1.0
-generated by GNU Autoconf 2.64
+ubuntuone-client configure 1.1.2
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1701,7 +1708,7 @@
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1747,7 +1754,7 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1815,7 +1822,7 @@
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1857,7 +1864,7 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -1931,8 +1938,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ubuntuone-client $as_me 1.1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by ubuntuone-client $as_me 1.1.2, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2185,7 +2192,7 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -2194,9 +2201,9 @@
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2617,6 +2624,7 @@
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2624,7 +2632,6 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2741,7 +2748,7 @@
 
 # Define the identity of the package.
  PACKAGE='ubuntuone-client'
- VERSION='1.1.0'
+ VERSION='1.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3168,32 +3175,30 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3255,10 +3260,10 @@
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -3266,51 +3271,18 @@
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3343,13 +3315,72 @@
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -4119,8 +4150,8 @@
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -4472,8 +4503,8 @@
 
 
 
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
 
 
 
@@ -5144,13 +5175,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5147: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5178: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5150: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5181: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5153: output\"" >&5)
+  (eval echo "\"\$as_me:5184: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5616,7 +5647,7 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6355,7 +6386,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6358 "configure"' > conftest.$ac_ext
+  echo '#line 6389 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7885,11 +7916,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7888: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7919: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7892: \$? = $ac_status" >&5
+   echo "$as_me:7923: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8054,7 +8085,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8224,11 +8255,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8227: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8258: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8231: \$? = $ac_status" >&5
+   echo "$as_me:8262: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8329,11 +8360,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8332: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8363: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8336: \$? = $ac_status" >&5
+   echo "$as_me:8367: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8384,11 +8415,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8418: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8391: \$? = $ac_status" >&5
+   echo "$as_me:8422: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8527,6 +8558,7 @@
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8618,7 +8650,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -10080,7 +10112,7 @@
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10767,7 +10799,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10770 "configure"
+#line 10802 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10863,7 +10895,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10866 "configure"
+#line 10898 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11893,6 +11925,37 @@
 fi
 
 
+# Alter default logging if we're development vs. stable
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking development series build" >&5
+$as_echo_n "checking development series build... " >&6; }
+DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
+if expr $DEVVERSION % 2 > /dev/null != "0"; then
+   debugging=yes
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   debugging=no
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; enable_debug=$enableval
+else
+  enable_debug=$debugging
+fi
+
+if test "x$enable_debug" != "xno"; then
+   LOG_LEVEL="DEBUG"
+   LOG_FILE_SIZE="10485760"
+else
+   LOG_LEVEL="INFO"
+   LOG_FILE_SIZE="1048576"
+fi
+
+
+
 # Check for python 2.5
 
 
@@ -12058,6 +12121,14 @@
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
      esac
 
 fi
@@ -12088,6 +12159,14 @@
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
      esac
 
 fi
@@ -12167,12 +12246,12 @@
         pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.6.0" 2>/dev/null`
+  pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12185,12 +12264,12 @@
         pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.6.0" 2>/dev/null`
+  pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12209,14 +12288,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= 2.6.0"`
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0"`
         else
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= 2.6.0"`
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NAUTILUS_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libnautilus-extension >= 2.6.0) were not met:
+	as_fn_error "Package requirements (libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0) were not met:
 
 $NAUTILUS_PKG_ERRORS
 
@@ -12893,8 +12972,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ubuntuone-client $as_me 1.1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by ubuntuone-client $as_me 1.1.2, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12934,6 +13013,7 @@
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -12956,10 +13036,11 @@
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ubuntuone-client config.status 1.1.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ubuntuone-client config.status 1.1.2
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -12997,6 +13078,8 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -13444,7 +13527,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -13458,7 +13541,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p

=== modified file 'configure.ac'
--- configure.ac	2009-12-07 17:35:00 +0000
+++ configure.ac	2010-02-18 00:10:25 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [1.1.0])
+AC_INIT([ubuntuone-client], [1.1.2])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
@@ -46,6 +46,32 @@
 fi
 AM_CONDITIONAL(ENABLE_RENDERING, test "x$enable_rendering" = "xyes")
 
+# 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"
+else
+   LOG_LEVEL="INFO"
+   LOG_FILE_SIZE="1048576"
+fi
+AC_SUBST(LOG_LEVEL)
+AC_SUBST(LOG_FILE_SIZE)
+
 # Check for python 2.5
 AM_PATH_PYTHON([2.5])
 
@@ -90,7 +116,7 @@
 AC_SUBST(USP_PATH)
 
 # Stuff we need to build the extension shlib
-PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0])
+PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0])
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 

=== modified file 'contrib/__init__.pyc'
Binary files contrib/__init__.pyc	2009-12-07 17:35:00 +0000 and contrib/__init__.pyc	2010-02-18 00:10:25 +0000 differ
=== added file 'contrib/dbus-docs'
--- contrib/dbus-docs	1970-01-01 00:00:00 +0000
+++ contrib/dbus-docs	2010-02-18 00:10:25 +0000
@@ -0,0 +1,196 @@
+#!/usr/bin/env python
+#
+# Author: Guillermo Gonzalez <[e-mail]>
+#
+# Copyright 2009 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/>.
+
+from twisted.internet import glib2reactor
+glib2reactor.install()
+
+import sys
+import os
+import signal
+import dbus
+import subprocess
+import shutil
+
+from xml.etree import ElementTree
+
+sys.path.insert(0, os.path.abspath("."))
+
+from contrib.dbus_util import DBusRunner
+from contrib.testing.testcase import (
+    FakeMain, 
+    DBusGMainLoop, 
+    DBusInterface, 
+    FakeNetworkManager,
+)
+
+from ubuntuone.syncdaemon.dbus_interface import (
+    DBUS_IFACE_SYNC_NAME,
+    DBUS_IFACE_STATUS_NAME,
+    DBUS_IFACE_EVENTS_NAME,
+    DBUS_IFACE_FS_NAME,
+    DBUS_IFACE_SHARES_NAME,
+    DBUS_IFACE_CONFIG_NAME,
+    DBUS_IFACE_FOLDERS_NAME,
+)
+from ubuntuone.syncdaemon.tools import DBusClient
+from twisted.internet import reactor, defer
+
+
+iface_path = ((DBUS_IFACE_SYNC_NAME, '/'), (DBUS_IFACE_CONFIG_NAME, '/config'),
+              (DBUS_IFACE_EVENTS_NAME, '/events'), 
+              (DBUS_IFACE_FS_NAME, '/filesystem'), 
+              (DBUS_IFACE_SHARES_NAME, '/shares'), 
+              (DBUS_IFACE_STATUS_NAME, '/status'),
+              (DBUS_IFACE_FOLDERS_NAME, '/folders'), 
+             )
+
+
+def parse_introspect_data(xml):
+    """Parse the xml returned by Introspect and returns a dict"""
+    info = dict()
+    e = ElementTree.fromstring(xml)
+    for c in e.findall('interface'):
+        # ignore other interfaces 
+        if not c.attrib['name'].startswith('com.ubuntuone'):
+            continue
+        iface_name = c.attrib['name']
+        info[iface_name] = dict()
+        # methods
+        methods = dict()
+        for method in c.findall('method'):
+            meth_name = method.attrib['name']
+            args = []
+            for arg in method.findall('arg'):
+                dir = arg.attrib['direction']
+                type = arg.attrib['type']
+                if 'name' in arg.attrib:
+                    name = arg.attrib['name']
+                    args.append((type, dir, name))
+                else:
+                    args.append((type, dir))
+            docstrings = method.findall('docstring')
+            docstring = docstrings[0].text if docstrings else 'No docstring'
+            methods[meth_name] = dict(args=args, docstring=docstring)
+        info[iface_name]['methods'] = methods
+        # signals
+        signals = dict()
+        for signal in c.findall('signal'):
+            sig_name = signal.attrib['name']
+            args = []
+            for arg in signal.findall('arg'):
+                type = arg.attrib['type']
+                name = arg.attrib['name']
+                args.append((type, name))
+            docstrings = signal.findall('docstring')
+            docstring = docstrings[0].text if docstrings else 'No docstring'
+            signals[sig_name] = dict(args=args, docstring=docstring)
+        info[iface_name]['signals'] = signals
+    return info
+
+
+def get_info(path):
+    """Get all the introspectable info from 'path'"""
+    d = defer.Deferred()
+    client = DBusClient(bus, path, 'org.freedesktop.DBus.Introspectable')
+    client.call_method('Introspect', reply_handler=d.callback, 
+                       error_handler=d.errback)
+    return d
+
+
+def dump_to_stream(info_by_path, stream):
+    print >>stream, "SyncDaemon DBus API\n"
+    for path, interfaces in info_by_path.items():
+        print >>stream, "Object path: %s" % path
+        for iface_name, kinds in interfaces.items():
+            print >>stream, "  Interface: %s" % iface_name
+            print >>stream, "    Methods:"
+            for meth_name, val in kinds['methods'].items():
+                in_args = ','.join([arg[2] + '=' + arg[0] for arg in 
+                                    val['args'] if arg[1] == 'in'])
+                out_args = ','.join([arg[0] for arg in val['args'] 
+                                     if arg[1] == 'out'])
+                if out_args and in_args:
+                    print >>stream, "      %s(%s) -> %s" % (meth_name, in_args,
+                                                            out_args)
+                elif in_args:
+                    print >>stream, "      %s(%s)" % (meth_name, in_args)
+                else:
+                    print >>stream, "      %s()" % meth_name
+                print >>stream, "        %s\n" % val['docstring']
+            print >>stream, "    Signals:"
+            for signal_name, val in kinds['signals'].items():
+                in_args = ','.join([arg[1] + '=' + arg[0] \
+                                    for arg in val['args']])
+                if in_args:
+                    print >>stream, "      %s(%s)" % (signal_name, in_args)
+                else:
+                    print >>stream, "      %s(%s)" % signal_name
+                print >>stream, "        %s\n" % val['docstring']
+
+
[e-mail]
+def main(bus):
+    """Entry point"""
+    info_by_path = dict()
+    for iface, path in iface_path:
+        xml = yield get_info(path)
+        obj_info = parse_introspect_data(xml)
+        info_by_path[path] = obj_info
+    dest_file = os.path.join(os.getcwd(), 'docs', 'syncdaemon_dbus_api.txt')
+    with open(dest_file, 'w') as f:
+        dump_to_stream(info_by_path, f)
+    reactor.stop() 
+
+
+def start_syncdaemon(tmp_dir):
+    """Starts a syncdaemon instance just like the one used in the test suite"""
+    xdg_cache = os.path.join(tmp_dir, 'xdg_cache')
+    data_dir = os.path.join(xdg_cache, 'data')
+    partials_dir = os.path.join(xdg_cache, 'partials')
+    root_dir = os.path.join(tmp_dir, 'root')
+    shares_dir = os.path.join(tmp_dir, 'shares')
+    main = FakeMain(root_dir, shares_dir, data_dir, partials_dir)
+    loop = DBusGMainLoop(set_as_default=True)
+    bus = dbus.bus.BusConnection(mainloop=loop)
+    nm = FakeNetworkManager(bus)
+    dbus_iface = DBusInterface(bus, main, system_bus=bus)
+    main.dbus_iface = dbus_iface
+    return main, bus
+
+
+if __name__ == '__main__':
+    dbus_runner = DBusRunner()
+    dbus_runner.startDBus()
+    tmp_dir = os.path.join(os.getcwd(), 'tmp')
+    try:
+
+        m, bus = start_syncdaemon(tmp_dir)
+        try:
+            reactor.callWhenRunning(main, bus)
+            reactor.run()
+        finally:
+            m.quit()
+    finally:
+        dbus_runner.stopDBus()
+        # remove the tmp dir
+        os.chmod(tmp_dir, 0777)
+        for dirpath, dirs, _ in os.walk(tmp_dir):
+            for dir in dirs:
+                os.chmod(os.path.join(dirpath, dir), 0777)
+        shutil.rmtree(tmp_dir)
+

=== added file 'contrib/dbus_util.py'
--- contrib/dbus_util.py	1970-01-01 00:00:00 +0000
+++ contrib/dbus_util.py	2010-02-18 00:10:25 +0000
@@ -0,0 +1,72 @@
+#
+# Author: Guillermo Gonzalez <[e-mail]>
+#
+# Copyright 2009 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/>.
+
+import os
+import signal
+import subprocess
+
+from distutils.spawn import find_executable
+
+
+class DBusLaunchError(Exception):
+    """Error while launching dbus-daemon"""
+    pass
+
+class NotFoundError(Exception):
+    """Not found error"""
+    pass
+
+
+class DBusRunner(object):
+
+    def __init__(self):
+        self.dbus_address = None
+        self.dbus_pid = None
+        self.running = False
+
+    def startDBus(self):
+        """Start our own session bus daemon for testing."""
+        dbus = find_executable("dbus-daemon")
+        if not dbus:
+            raise NotFoundError("dbus-daemon was not found.")
+
+        config_file = os.path.join(os.getcwd(), "contrib", "testing",
+                                   "dbus-session.conf")
+        dbus_args = ["--fork",
+                     "--config-file=" + config_file,
+                     "--print-address=1",
+                     "--print-pid=2"]
+        p = subprocess.Popen([dbus] + dbus_args,
+                             bufsize=4096, stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+
+        self.dbus_address = "".join(p.stdout.readlines()).strip()
+        self.dbus_pid = int("".join(p.stderr.readlines()).strip())
+
+        if self.dbus_address != "":
+            os.environ["DBUS_SESSION_BUS_ADDRESS"] = self.dbus_address
+        else:
+            os.kill(self.dbus_pid, signal.SIGKILL)
+            raise DBusLaunchError("There was a problem launching dbus-daemon.")
+        self.running = True
+
+    def stopDBus(self):
+        """Stop our DBus session bus daemon."""
+        del os.environ["DBUS_SESSION_BUS_ADDRESS"]
+        os.kill(self.dbus_pid, signal.SIGKILL)
+        self.running = False
+

=== added file 'contrib/dbus_util.pyc'
Binary files contrib/dbus_util.pyc	1970-01-01 00:00:00 +0000 and contrib/dbus_util.pyc	2010-02-18 00:10:25 +0000 differ
=== modified file 'contrib/mocker.pyc'
Binary files contrib/mocker.pyc	2009-12-07 17:35:00 +0000 and contrib/mocker.pyc	2010-02-18 00:10:25 +0000 differ
=== modified file 'contrib/test'
--- contrib/test	2009-12-07 17:35:00 +0000
+++ contrib/test	2010-02-18 00:10:25 +0000
@@ -66,37 +66,7 @@
                         suite.addTests(module_suite)
         return suite
 
-    def startDBus(self):
-        """Start our own session bus daemon for testing."""
-        dbus = find_executable("dbus-daemon")
-        if not dbus:
-            raise NotFoundError("dbus-daemon was not found.")
-
-        config_file = os.path.join(os.getcwd(), "contrib", "testing",
-                                   "dbus-session.conf")
-        dbus_args = ["--fork",
-                     "--config-file=" + config_file,
-                     "--print-address=1",
-                     "--print-pid=2"]
-        p = subprocess.Popen([dbus] + dbus_args,
-                             bufsize=4096, stdout=subprocess.PIPE, 
-                             stderr=subprocess.PIPE)
-
-        self.dbus_address = "".join(p.stdout.readlines()).strip()
-        self.dbus_pid = int("".join(p.stderr.readlines()).strip())
-
-        if self.dbus_address != "":
-            os.environ["DBUS_SESSION_BUS_ADDRESS"] = self.dbus_address
-        else:
-            os.kill(self.dbus_pid, signal.SIGKILL)
-            raise DBusLaunchError("There was a problem launching dbus-daemon.")
-
-    def stopDBus(self):
-        """Stop our DBus session bus daemon."""
-        del os.environ["DBUS_SESSION_BUS_ADDRESS"]
-        os.kill(self.dbus_pid, signal.SIGKILL)
-
-    def run(self, testpath, test_pattern=None):
+    def run(self, testpath, test_pattern=None, loops=None):
         """run the tests. """
         # install the glib2reactor before any import of the reactor to avoid
         # using the default SelectReactor and be able to run the dbus tests
@@ -106,7 +76,9 @@
         from twisted.trial.reporter import TreeReporter
         from twisted.trial.runner import TrialRunner
 
-        self.startDBus()
+        from contrib.dbus_util import DBusRunner
+        dbus_runner = DBusRunner()
+        dbus_runner.startDBus()
 
         workingDirectory = os.path.join(os.getcwd(), "_trial_temp", "tmp")
         runner = TrialRunner(reporterFactory=TreeReporter, realTimeErrors=True,
@@ -115,17 +87,22 @@
         # setup a custom XDG_CACHE_HOME and create the logs directory
         xdg_cache = os.path.join(os.getcwd(), "_trial_temp", "xdg_cache")
         os.environ["XDG_CACHE_HOME"] = xdg_cache
-        # setup the ROOT_DIR env var
-        os.environ['ROOT_DIR'] = os.getcwd()
+        # setup the ROOTDIR env var
+        os.environ['ROOTDIR'] = os.getcwd()
         if not os.path.exists(xdg_cache):
             os.makedirs(xdg_cache)
         success = 0
         try:
             suite = self._collect_tests(testpath, test_pattern)
+            if loops:
+                old_suite = suite
+                suite = unittest.TestSuite()
+                for x in xrange(loops):
+                    suite.addTest(old_suite)
             result = runner.run(suite)
             success = result.wasSuccessful()
         finally:
-            self.stopDBus()
+            dbus_runner.stopDBus()
         if not success:
             sys.exit(1)
         else:
@@ -138,6 +115,9 @@
     parser = OptionParser(usage=usage)
     parser.add_option("-t", "--test", dest="test",
                   help = "run specific tests, e.g: className.methodName")
+    parser.add_option("-l", "--loop", dest="loops", type="int", default=1,
+                      help = "loop selected tests LOOPS number of times", 
+                      metavar="LOOPS")
 
     (options, args) = parser.parse_args()
     if args:
@@ -147,4 +127,4 @@
             sys.exit()
     else:
         testpath = None
-    TestRunner().run(testpath, options.test) 
+    TestRunner().run(testpath, options.test, options.loops) 

=== modified file 'contrib/testing/__init__.pyc'
Binary files contrib/testing/__init__.pyc	2009-12-07 17:35:00 +0000 and contrib/testing/__init__.pyc	2010-02-18 00:10:25 +0000 differ
=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2009-10-16 13:35:00 +0000
+++ contrib/testing/testcase.py	2010-02-18 00:10:25 +0000
@@ -19,11 +19,12 @@
 
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
+import contextlib
 import logging
 import os
 import shutil
 
-
+from ubuntuone.oauthdesktop.main import Login, LoginProcessor
 from ubuntuone.syncdaemon import (
     config,
     action_queue,
@@ -32,16 +33,33 @@
     interfaces,
     volume_manager,
     main,
+    local_rescan,
 )
 from ubuntuone.syncdaemon.dbus_interface import (
     DBusInterface,
     DBusExposedObject,
     NM_STATE_CONNECTED,
     NM_STATE_DISCONNECTED,
+    DBUS_IFACE_AUTH_NAME,
 )
 from twisted.internet import defer
+from twisted.python import failure
 from twisted.trial.unittest import TestCase as TwistedTestCase
 from zope.interface import implements
+from oauth import oauth
+
+
[e-mail]
+def environ(env_var, new_value):
+    """context manager to replace/add an environ value"""
+    old_value = os.environ.get(env_var, None)
+    os.environ[env_var] = new_value
+    yield
+    if old_value is None:
+        os.environ.pop(env_var)
+    else:
+        os.environ[env_var] = old_value
+
 
 class FakeOAuthClient(object):
     """ Fake OAuthClient"""
@@ -49,7 +67,7 @@
     def __init__(self, realm):
         """ create the instance. """
         self.realm = realm
-        self.consumer = 'ubuntuone'
+        self.consumer = oauth.OAuthConsumer('ubuntuone', 'hammertime')
 
     def get_access_token(self):
         """ returns a Token"""
@@ -103,13 +121,15 @@
                                                self.partials_dir, self.vm)
         self.event_q = event_queue.EventQueue(self.fs)
         self.fs.register_eq(self.event_q)
-        self.action_q = FakeActionQueue(self.event_q)
+        self.action_q = FakeActionQueue(self.event_q, main=self)
         self.state = main.SyncDaemonStateManager(self, 2, 0)
         self.event_q.subscribe(self.vm)
         self.vm.init_root()
         self.hash_q = FakeHashQueue()
         self.mark = FakeMark()
         self.dbus_iface = FakeDBusInterface()
+        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
+                                           self.event_q, self.action_q)
 
     def _connect_aq(self, token):
         """ Connect the fake action queue """
@@ -193,14 +213,18 @@
 
     def setUp(self):
         TwistedTestCase.setUp(self)
-        # invalidate the current config
+        # use the config from the branch
+        self.old_get_config_files = config.get_config_files
+        config.get_config_files = lambda: [os.path.join(os.environ['ROOTDIR'],
+                                                   'data', 'syncdaemon.conf')]
+        # fake a very basic config file with sane defaults for the tests
         config_file = os.path.join(self.mktemp('config'), 'syncdaemon.conf')
-        # fake a very basic config file with sane defaults for the tests
         with open(config_file, 'w') as fp:
             fp.write('[bandwidth_throttling]\n')
             fp.write('on = False\n')
             fp.write('read_limit = -1\n')
             fp.write('write_limit = -1\n')
+        # invalidate the current config
         config._user_config = None
         config.get_user_config(config_file=config_file)
 
@@ -208,7 +232,8 @@
         """ cleanup the temp dir. """
         # invalidate the current config
         config._user_config = None
-        config.get_user_config()
+        # restore the old get_config_files
+        config.get_config_files = self.old_get_config_files
         if hasattr(self, '__root'):
             self.rmtree(self.__root)
         return TwistedTestCase.tearDown(self)
@@ -253,7 +278,7 @@
 
     def tearDown(self):
         """ Cleanup the test. """
-        d = self.cleanup_signal_receivers()
+        d = self.cleanup_signal_receivers(self.signal_receivers)
         d.addBoth(self._tearDown)
         d.addBoth(lambda _: BaseTwistedTestCase.tearDown(self))
         return d
@@ -272,18 +297,22 @@
         self.log.info("finished test %s.%s", self.__class__.__name__,
                       self._testMethodName)
 
-    def error_handler(self, *error):
+    def error_handler(self, error):
         """ default error handler for DBus calls. """
-        self.fail(error)
+        if isinstance(error, failure.Failure):
+            self.fail(error.getErrorMessage())
+        else:
+            self.fail(str(error))
 
-    def cleanup_signal_receivers(self):
+    def cleanup_signal_receivers(self, signal_receivers):
         """ cleanup self.signal_receivers and returns a deferred """
         deferreds = []
-        for match in self.signal_receivers:
+        for match in signal_receivers:
             d = defer.Deferred()
             def callback(*args):
                 """ callback that accepts *args. """
-                d.callback(args)
+                if not d.called:
+                    d.callback(args)
             self.bus.call_async(dbus.bus.BUS_DAEMON_NAME,
                                 dbus.bus.BUS_DAEMON_PATH,
                                 dbus.bus.BUS_DAEMON_IFACE, 'RemoveMatch', 's',
@@ -297,14 +326,15 @@
 
 
 class FakeActionQueue(object):
-    """ stub implementation """
+    """Stub implementation."""
 
     implements(interfaces.IActionQueue)
 
     def __init__(self, eq, *args, **kwargs):
         """ Creates the instance """
         self.eq = self.event_queue = eq
-        self.client = action_queue.ActionQueueProtocol()
+        self.client = action_queue.ActionQueue.protocol()
+        self.client.disconnect = lambda: None
         self.uploading = {}
         self.downloading = {}
         # pylint: disable-msg=C0103
@@ -324,76 +354,68 @@
         self.throttling = False
 
     def connect(self, host=None, port=None, user_ssl=False):
-        """ stub implementation """
+        """Stub implementation."""
         self.eq.push('SYS_CONNECTION_MADE')
 
     def disconnect(self):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def enable_throttling(self, value):
         self.throttling = value
 
     def cancel_download(self, share_id, node_id):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def cancel_upload(self, share_id, node_id):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def download(self, share_id, node_id, server_hash, fileobj):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def upload(self, share_id, node_id, previous_hash, hash, crc32,
                size, deflated_size, fileobj):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def make_file(self, share_id, parent_id, name, marker):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def make_dir(self, share_id, parent_id, name, marker):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def move(self, share_id, node_id, old_parent_id, new_parent_id, new_name):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def unlink(self, share_id, node_id):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def query(self, items):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def listdir(self, share_id, node_id, server_hash, fileobj):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def list_shares(self):
+        """Stub implementation."""
+
+    def list_volumes(self):
         """ stub implementation """
         pass
 
     def answer_share(self, share_id, answer):
-        """ stub implementation """
+        """Stub implementation."""
         self.eq.push('AQ_ANSWER_SHARE_OK', share_id, answer)
 
     def create_share(self, *args):
         """ sutb implementation """
-        pass
 
     def inquire_free_space(self, share_id):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
 
     def inquire_account_info(self):
-        """ stub implementation """
-        pass
+        """Stub implementation."""
+
+    def delete_volume(self, volume_id):
+        """Stub implementation."""
 
 
 class MementoHandler(logging.Handler):
@@ -464,12 +486,13 @@
 
     def __init__(self, root_path):
         """ Creates the instance"""
-        self.root = volume_manager.Share(root_path, access_level='Modify')
+        self.root = volume_manager.Share(path=root_path, access_level='Modify')
         self.shares = {'':self.root}
+        self.udfs = {}
         self.log = logging.getLogger('ubuntuone.SyncDaemon.VM-test')
 
     def add_share(self, share):
-        """ Adss share to the shares dict """
+        """Add share to the shares dict."""
         self.shares[share.id] = share
         # if the share don't exists, create it
         if not os.path.exists(share.path):
@@ -478,7 +501,117 @@
         if not share.can_write():
             os.chmod(share.path, 0555)
 
+    def add_udf(self, udf):
+        """Add udf to the udfs dict."""
+        self.udfs[udf.id] = udf
+
     def on_server_root(self, _):
-        """
-        Do nothing
-        """
+        """Do nothing."""
+
+    def share_deleted(self, _):
+        """Do nothing."""
+
+    def get_volume(self, id):
+        """Returns a share or a UDF."""
+        try:
+            return self.shares[id]
+        except KeyError:
+            return self.udfs[id]
+
+    def get_volumes(self, access_level='Modify', all_volumes=False):
+        """Simple get_volumes for FakeVolumeManager."""
+        for share in self.shares.values():
+            if all_volumes or share.access_level == access_level:
+                yield share
+        for udf in self.udfs.values():
+            if all_volumes or udf.subscribed:
+                yield udf
+
+    def unsubscribe_udf(self, udf_id):
+        """Mark the UDF with udf_id as unsubscribed."""
+        udf = self.udfs[udf_id]
+        udf.subscribed = False
+        self.udfs[udf_id] = udf
+
+    def delete_volume(self, volume_id):
+        """Request the deletion of a volume."""
+
+# OAuth stubs
+class FakeLoginProcessor(LoginProcessor):
+    """Stub login processor."""
+
+    def __init__(self, dbus_object):
+        """Initialize the login processor."""
+        LoginProcessor.__init__(self, dbus_object, use_libnotify=False)
+        self.next_login_cb = None
+
+    def login(self, realm, consumer_key, error_handler=None,
+              reply_handler=None, do_login=True):
+        """Stub, call self.next_login_cb or send NewCredentials if
+        self.next_login_cb isn't defined.
+        """
+        self.realm = str(realm)
+        self.consumer_key = str(consumer_key)
+        if self.next_login_cb:
+            cb = self.next_login_cb[0]
+            args = self.next_login_cb[1]
+            self.next_login_cb = None
+            return cb(*args)
+        else:
+            self.dbus_object.NewCredentials(realm, consumer_key)
+
+    def clear_token(self, realm, consumer_key):
+        """Stub, do nothing"""
+        pass
+
+    def next_login_with(self, callback, args=tuple()):
+        """shortcircuit the next call to login and call the specified callback.
+        callback is usually one of: self.got_token, self.got_no_token,
+        self.got_denial or self.got_error.
+        """
+        self.next_login_cb = (callback, args)
+
+
+class FakeLogin(Login):
+    """Stub Object which listens for D-Bus OAuth requests"""
+
+    def __init__(self, bus):
+        """Initiate the object."""
+        self.bus = bus
+        self.busName = dbus.service.BusName(DBUS_IFACE_AUTH_NAME, bus=self.bus)
+        # bypass the parent class __init__ as it has the path hardcoded
+        # and we can't use '/' as the path, as we are already using it
+        # for syncdaemon. pylint: disable-msg=W0233,W0231
+        dbus.service.Object.__init__(self, object_path="/oauthdesktop",
+                                     bus_name=self.busName)
+        self.processor = FakeLoginProcessor(self)
+        self.currently_authing = False
+
+    def shutdown(self):
+        """Shutdown and remove any trace from the bus"""
+        self.busName.get_bus().release_name(self.busName.get_name())
+        self.remove_from_connection()
+
+
+class Listener(object):
+    """Helper class to gather events."""
+
+    def __init__(self):
+        self.events = []
+
+    def handle_default(self, event_name, *args, **kwargs):
+        """Keep record of every event."""
+        self.events.append((event_name, args, kwargs))
+
+
+def noop(*args, **kwargs):
+    """No op."""
+
+
+class DummyClass(object):
+    """Dummy class, does nothing."""
+
+    def __getattribute__(self, name):
+        """Any attribute is a no-op."""
+        return noop
+

=== modified file 'contrib/testing/testcase.pyc'
Binary files contrib/testing/testcase.pyc	2009-12-07 17:35:00 +0000 and contrib/testing/testcase.pyc	2010-02-18 00:10:25 +0000 differ
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-09-28 18:15:00 +0000
+++ data/Makefile.am	2010-02-18 00:10:25 +0000
@@ -6,17 +6,29 @@
 crashdb_DATA = ubuntuone-client-crashdb.conf
 
 configdir = $(sysconfdir)/xdg/ubuntuone
-config_DATA = oauth_urls syncdaemon.conf
+config_in_files = logging.conf.in
+config_DATA = oauth_urls syncdaemon.conf $(config_in_files:.conf.in=.conf)
 
 oauthdir = $(configdir)/oauth_registration.d
 oauth_DATA = oauth_registration.d/ubuntuone
 
+memenudir = $(datadir)/indicators/me
+memenu_in_files = ubuntuone.menu.in
+memenu_DATA = $(memenu_in_files:.menu.in=.menu)
+
+%.menu: %.menu.in
+	@sed -e "s|\@DATADIR\@|$(datadir)|" $< > $@
+
 desktopdir = $(datadir)/applications
-desktop_in_files = ubuntuone-client-applet.desktop.in
+desktop_in_files = ubuntuone-preferences.desktop.in
 desktop_DATA = $(desktop_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)|" $< > $@
+
 hicolordir = $(datadir)/icons/hicolor
 privateiconsdir = $(pkgdatadir)/icons/hicolor
 emblem_in_files = 				\
@@ -117,7 +129,9 @@
 	rm -rf icons
 
 EXTRA_DIST =			\
-	$(desktop_in_files)	\
+	$(config_in_files)	\
+	$(memenu_in_files)	\
+	$(desktop_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
 	$(icon_in_files)	\
@@ -128,7 +142,8 @@
 	oauth_registration.d
 
 CLEANFILES =		\
-	$(desktop_DATA)	\
+	$(memenu_DATA)	\
+	$(desktop_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\
 	hicolor

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2009-09-28 18:15:00 +0000
+++ data/Makefile.in	2010-02-18 00:10:25 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,9 +72,10 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(configdir)" \
 	"$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"
+	"$(DESTDIR)$(memenudir)" "$(DESTDIR)$(oauthdir)" \
+	"$(DESTDIR)$(servicedir)"
 DATA = $(apport_DATA) $(config_DATA) $(crashdb_DATA) $(desktop_DATA) \
-	$(oauth_DATA) $(service_DATA)
+	$(memenu_DATA) $(oauth_DATA) $(service_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -126,6 +127,8 @@
 LIPO = @LIPO@
 LNDIR = @LNDIR@
 LN_S = @LN_S@
+LOG_FILE_SIZE = @LOG_FILE_SIZE@
+LOG_LEVEL = @LOG_LEVEL@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -224,11 +227,15 @@
 crashdbdir = $(sysconfdir)/apport/crashdb.conf.d
 crashdb_DATA = ubuntuone-client-crashdb.conf
 configdir = $(sysconfdir)/xdg/ubuntuone
-config_DATA = oauth_urls syncdaemon.conf
+config_in_files = logging.conf.in
+config_DATA = oauth_urls syncdaemon.conf $(config_in_files:.conf.in=.conf)
 oauthdir = $(configdir)/oauth_registration.d
 oauth_DATA = oauth_registration.d/ubuntuone
+memenudir = $(datadir)/indicators/me
+memenu_in_files = ubuntuone.menu.in
+memenu_DATA = $(memenu_in_files:.menu.in=.menu)
 desktopdir = $(datadir)/applications
-desktop_in_files = ubuntuone-client-applet.desktop.in
+desktop_in_files = ubuntuone-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 hicolordir = $(datadir)/icons/hicolor
 privateiconsdir = $(pkgdatadir)/icons/hicolor
@@ -248,7 +255,9 @@
 icon_cache = $(icon_in_files:.svg=.rendercache)
 icon_files = $(shell BUILDDIR="$(builddir)"; for i in `find $$BUILDDIR -name "*.rendercache"`; do cat $$i|sort|uniq; done)
 EXTRA_DIST = \
-	$(desktop_in_files)	\
+	$(config_in_files)	\
+	$(memenu_in_files)	\
+	$(desktop_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
 	$(icon_in_files)	\
@@ -259,7 +268,8 @@
 	oauth_registration.d
 
 CLEANFILES = \
-	$(desktop_DATA)	\
+	$(memenu_DATA)	\
+	$(desktop_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\
 	hicolor
@@ -387,6 +397,26 @@
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+install-memenuDATA: $(memenu_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(memenudir)" || $(MKDIR_P) "$(DESTDIR)$(memenudir)"
+	@list='$(memenu_DATA)'; test -n "$(memenudir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(memenudir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(memenudir)" || exit $$?; \
+	done
+
+uninstall-memenuDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(memenu_DATA)'; test -n "$(memenudir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(memenudir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(memenudir)" && rm -f $$files
 install-oauthDATA: $(oauth_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(oauthdir)" || $(MKDIR_P) "$(DESTDIR)$(oauthdir)"
@@ -471,7 +501,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"; do \
+	for dir in "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(memenudir)" "$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -523,7 +553,7 @@
 
 install-data-am: install-apportDATA install-configDATA \
 	install-crashdbDATA install-data-local install-desktopDATA \
-	install-oauthDATA install-serviceDATA
+	install-memenuDATA install-oauthDATA install-serviceDATA
 
 install-dvi: install-dvi-am
 
@@ -570,7 +600,7 @@
 
 uninstall-am: uninstall-apportDATA uninstall-configDATA \
 	uninstall-crashdbDATA uninstall-desktopDATA uninstall-local \
-	uninstall-oauthDATA uninstall-serviceDATA
+	uninstall-memenuDATA uninstall-oauthDATA uninstall-serviceDATA
 
 .MAKE: install-am install-strip
 
@@ -582,19 +612,26 @@
 	install-data-local install-desktopDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-oauthDATA install-pdf install-pdf-am install-ps \
-	install-ps-am install-serviceDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-apportDATA \
-	uninstall-configDATA uninstall-crashdbDATA \
-	uninstall-desktopDATA uninstall-local uninstall-oauthDATA \
-	uninstall-serviceDATA
-
+	install-memenuDATA install-oauthDATA install-pdf \
+	install-pdf-am install-ps install-ps-am install-serviceDATA \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-apportDATA uninstall-configDATA \
+	uninstall-crashdbDATA uninstall-desktopDATA uninstall-local \
+	uninstall-memenuDATA uninstall-oauthDATA uninstall-serviceDATA
+
+
+%.menu: %.menu.in
+	@sed -e "s|\@DATADIR\@|$(datadir)|" $< > $@
 
 @INTLTOOL_DESKTOP_RULE@
 
+%.conf: %.conf.in
+	@sed -e "s|\@LOG_LEVEL\@|$(LOG_LEVEL)|" \
+		-e "s|\@LOG_FILE_SIZE\@|$(LOG_FILE_SIZE)|" $< > $@
+
 %.icon:   %.icon.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 %.service: %.service.in

=== modified file 'data/com.ubuntuone.Authentication.service.in'
--- data/com.ubuntuone.Authentication.service.in	2009-06-30 12:00:00 +0000
+++ data/com.ubuntuone.Authentication.service.in	2010-02-18 00:10:25 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.ubuntuone.Authentication
-Exec=@bindir@/ubuntuone-client-applet
+Exec=@libexecdir@/ubuntuone-login

=== removed file 'data/icons/16x16/apps/ubuntuone-client.png'
Binary files data/icons/16x16/apps/ubuntuone-client.png	2009-09-28 18:15:00 +0000 and data/icons/16x16/apps/ubuntuone-client.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/icons/16x16/apps/ubuntuone.png'
Binary files data/icons/16x16/apps/ubuntuone.png	1970-01-01 00:00:00 +0000 and data/icons/16x16/apps/ubuntuone.png	2010-02-18 00:10:25 +0000 differ
=== removed file 'data/icons/16x16/status/ubuntuone-client-offline.png'
Binary files data/icons/16x16/status/ubuntuone-client-offline.png	2009-09-28 18:15:00 +0000 and data/icons/16x16/status/ubuntuone-client-offline.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/24x24/apps/ubuntuone-client.png'
Binary files data/icons/24x24/apps/ubuntuone-client.png	2009-09-28 18:15:00 +0000 and data/icons/24x24/apps/ubuntuone-client.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/icons/24x24/apps/ubuntuone.png'
Binary files data/icons/24x24/apps/ubuntuone.png	1970-01-01 00:00:00 +0000 and data/icons/24x24/apps/ubuntuone.png	2010-02-18 00:10:25 +0000 differ
=== removed file 'data/icons/24x24/status/ubuntuone-client-offline.png'
Binary files data/icons/24x24/status/ubuntuone-client-offline.png	2009-09-28 18:15:00 +0000 and data/icons/24x24/status/ubuntuone-client-offline.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/32x32/apps/ubuntuone-client.png'
Binary files data/icons/32x32/apps/ubuntuone-client.png	2009-09-28 18:15:00 +0000 and data/icons/32x32/apps/ubuntuone-client.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/icons/32x32/apps/ubuntuone.png'
Binary files data/icons/32x32/apps/ubuntuone.png	1970-01-01 00:00:00 +0000 and data/icons/32x32/apps/ubuntuone.png	2010-02-18 00:10:25 +0000 differ
=== removed file 'data/icons/32x32/status/ubuntuone-client-offline.png'
Binary files data/icons/32x32/status/ubuntuone-client-offline.png	2009-09-28 18:15:00 +0000 and data/icons/32x32/status/ubuntuone-client-offline.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/48x48/apps/ubuntuone-client.png'
Binary files data/icons/48x48/apps/ubuntuone-client.png	2009-09-28 18:15:00 +0000 and data/icons/48x48/apps/ubuntuone-client.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/icons/48x48/apps/ubuntuone.png'
Binary files data/icons/48x48/apps/ubuntuone.png	1970-01-01 00:00:00 +0000 and data/icons/48x48/apps/ubuntuone.png	2010-02-18 00:10:25 +0000 differ
=== removed file 'data/icons/48x48/status/ubuntuone-client-offline.png'
Binary files data/icons/48x48/status/ubuntuone-client-offline.png	2009-09-28 18:15:00 +0000 and data/icons/48x48/status/ubuntuone-client-offline.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/logging.conf'
--- data/logging.conf	1970-01-01 00:00:00 +0000
+++ data/logging.conf	2010-02-18 00:10:25 +0000
@@ -0,0 +1,13 @@
+[logging]
+level.default = DEBUG
+level.parser = log_level
+level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
+    CRITICAL, FATAL)
+
+file_size.default = 10485760
+file_size.parser = int
+file_size.help = max file size (the file will be rotated)
+
+backup_count.default = 5
+backup_count.parser = int
+backup_count.help = number of rotated log files to keep around.

=== added file 'data/logging.conf.in'
--- data/logging.conf.in	1970-01-01 00:00:00 +0000
+++ data/logging.conf.in	2010-02-18 00:10:25 +0000
@@ -0,0 +1,13 @@
+[logging]
+level.default = @LOG_LEVEL@
+level.parser = log_level
+level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
+    CRITICAL, FATAL)
+
+file_size.default = @LOG_FILE_SIZE@
+file_size.parser = int
+file_size.help = max file size (the file will be rotated)
+
+backup_count.default = 5
+backup_count.parser = int
+backup_count.help = number of rotated log files to keep around.

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2009-09-28 18:15:00 +0000
+++ data/syncdaemon.conf	2010-02-18 00:10:25 +0000
@@ -47,18 +47,13 @@
 im_ok_with_being_root_pretty_please_let_me_be_root.help = Allows the syncdaemon
     to run as root. Please don't use this option.
 
-log_level.default = INFO
-log_level.parser = log_level
-log_level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
-    CRITICAL, FATAL)
-
 send_events_over_dbus.default = False
 send_events_over_dbus.parser = bool
 send_events_over_dbus.action = store_true
 send_events_over_dbus.help = Enable sending "Event" singals for each internal 
     event
 
-handshake_timeout.default = 30
+handshake_timeout.default = 50
 handshake_timeout.parser = int
 handshake_timeout.help = The timeout for the connection and related states, in seconds
 
@@ -67,18 +62,23 @@
 max_handshake_timeouts.help = The number of consecutive handshake timeouts
                               before we give up
 
+udf_autosubscribe.default = True
+udf_autosubscribe.parser = bool
+udf_autosubscribe.help = Autosubsribe to new User Defined Folders, 'on' by default. 
+                         (accepted values: 1/0, on/off, true/false and yes/no)
+
 [bandwidth_throttling]
 on.default = False
 on.parser = bool
 on.action = store_true
 on.help = Enable bandwidth throttling
 
-read_limit.default = -1
+read_limit.default = 2097152
 read_limit.parser = throttling_limit
 read_limit.metavar = DOWNLOAD_LIMIT
 read_limit.help = Set the download limit (bytes/sec).
 
-write_limit.default = -1
+write_limit.default = 2097152
 write_limit.parser = throttling_limit
 write_limit.metavar = UPLOAD_LIMIT
 write_limit.help = Set the upload limit (bytes/sec).

=== removed file 'data/ubuntuone-client-applet.desktop.in'
--- data/ubuntuone-client-applet.desktop.in	2009-08-11 16:45:00 +0000
+++ data/ubuntuone-client-applet.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu One
-_Comment=Access and manage your Ubuntu One account
-Exec=ubuntuone-client-applet
-Icon=ubuntuone-client
-Terminal=false
-Type=Application
-Categories=GTK;Network;TrayIcon;
-X-Ubuntu-Gettext-Domain=ubuntuone-client

=== modified file 'data/ubuntuone-icons.rendercache'
--- data/ubuntuone-icons.rendercache	2009-09-28 18:15:00 +0000
+++ data/ubuntuone-icons.rendercache	2010-02-18 00:10:25 +0000
@@ -1,6 +1,5 @@
 status/ubuntuone-client-error.png
-status/ubuntuone-client-offline.png
 emblems/emblem-ubuntuone-unsynchronized.png
 status/ubuntuone-client-updating.png
 emblems/emblem-ubuntuone-updating.png
-apps/ubuntuone-client.png
+apps/ubuntuone.png

=== modified file 'data/ubuntuone-icons.svg'
--- data/ubuntuone-icons.svg	2009-09-28 18:15:00 +0000
+++ data/ubuntuone-icons.svg	2010-02-18 00:10:25 +0000
@@ -17,7 +17,7 @@
    height="600"
    id="svg11300"
    sodipodi:version="0.32"
-   inkscape:version="0.47pre1 r21720"
+   inkscape:version="0.47 r22583"
    sodipodi:docname="ubuntuone-icons.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
@@ -1522,16 +1522,6 @@
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_63_"
-       id="linearGradient6446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4956521,0,0,2.4956521,-223.97574,-53.226089)"
-       x1="113.0654"
-       y1="100.6621"
-       x2="113.0654"
-       y2="94.512703" />
-    <linearGradient
        x1="113.0654"
        y1="100.6621"
        x2="113.0654"
@@ -1552,17 +1542,6 @@
          id="stop500" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_64_"
-       id="radialGradient6448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.4956521,0,0,2.4956521,-223.97574,-53.226089)"
-       cx="113.0654"
-       cy="97.587898"
-       fx="113.667"
-       fy="98"
-       r="2.5631001" />
-    <radialGradient
        cx="113.0654"
        cy="97.587898"
        r="2.5631001"
@@ -1588,16 +1567,6 @@
          id="stop511" />
     </radialGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4120"
-       id="linearGradient6430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3024372,0,0,0.3560377,303.56427,209.43456)"
-       x1="7.6046205"
-       y1="28.481176"
-       x2="36.183067"
-       y2="40.943935" />
-    <linearGradient
        id="linearGradient4120">
       <stop
          style="stop-color:#555753;stop-opacity:1"
@@ -1608,17 +1577,6 @@
          offset="1.0000000"
          id="stop4124" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4244"
-       id="radialGradient6427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4569434,0.4167071,-0.2525086,0.6234641,302.55498,203.55522)"
-       cx="15.571491"
-       cy="2.958519"
-       fx="15.571491"
-       fy="2.958519"
-       r="20.935818" />
     <linearGradient
        id="linearGradient4244">
       <stop
@@ -1634,39 +1592,6 @@
          offset="1.0000000"
          id="stop4248" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7497"
-       id="radialGradient6424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.05803462,0.01454178,-0.00385459,0.0639583,303.56081,200.28873)"
-       cx="150.17931"
-       cy="301.80243"
-       fx="150.17931"
-       fy="301.80243"
-       r="106.18474" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7497">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7499" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7501" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7243"
-       id="linearGradient6442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.0962816,0,0,5.0962816,25.377261,30.286921)"
-       x1="7.0625"
-       y1="35.28125"
-       x2="24.6875"
-       y2="35.28125" />
     <linearGradient
        id="linearGradient7243">
       <stop
@@ -1679,39 +1604,6 @@
          style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
     </linearGradient>
     <linearGradient