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

[dobey]

[lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk]

24. By Luke Yelavich on 2010-03-31

* New upstream release.
  - Notify user when approaching and exceeding quota (LP: #540360)
  - Add instructional text to ubuntuone-preferences (LP: #539676)
  - UbuntuOne needs to autostart and connect by defualt (LP: #534707)
  - Impossible to infer status of file synchronization (LP: #526084)
  - Devices and Services tabs functionality and development (LP: #525803)
* Add debian/source/format.
* Remove python-httplib2 from the dependencies (LP: #535207)

25. By Luke Yelavich on 2010-04-01

releasing version 1.1.90-0ubuntu1

=== modified file 'Makefile.am'
--- Makefile.am	2010-02-17 23:51:29 +0000
+++ Makefile.am	2010-03-31 23:55:45 +0000
@@ -19,6 +19,7 @@
 # Install our scripts and extra data here
 bin_SCRIPTS =				\
 	bin/ubuntuone-preferences	\
+	bin/ubuntuone-launch		\
 	bin/u1sdtool			\
 	bin/u1sync
 

=== modified file 'Makefile.in'
--- Makefile.in	2010-02-17 23:51:29 +0000
+++ Makefile.in	2010-03-31 23:55:45 +0000
@@ -296,6 +296,7 @@
 # Install our scripts and extra data here
 bin_SCRIPTS = \
 	bin/ubuntuone-preferences	\
+	bin/ubuntuone-launch		\
 	bin/u1sdtool			\
 	bin/u1sync
 

=== modified file 'bin/u1sdtool'
--- bin/u1sdtool	2010-03-10 23:36:53 +0000
+++ bin/u1sdtool	2010-03-31 23:55:45 +0000
@@ -31,7 +31,6 @@
 from twisted.internet import reactor, defer
 
 from ubuntuone.syncdaemon.tools import SyncDaemonTool
-from ubuntuone.syncdaemon.dbus_interface import DBUS_IFACE_NAME
 from ubuntuone.syncdaemon.tools import (
     show_path_info,
     show_uploads,

=== added file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	1970-01-01 00:00:00 +0000
+++ bin/ubuntuone-launch	2010-03-31 23:55:45 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+
+# ubuntuone-start - Ubuntu One storage synchronization daemon startup helper
+#
+# Author: John Lenton <[e-mail]>
+#
+# Copyright 2010 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 sys
+import os
+
+U1ROOT=os.path.expanduser('~/Ubuntu One/')
+
+if __name__ == '__main__':
+    # this check is done early to speed up startup on people who are not
+    # (yet) using the service (this way avoids all the imports).
+    if not os.path.isdir(U1ROOT):
+        # no directory, just quit
+        sys.exit(1)
+
+import dbus
+import glib
+import gobject
+import gnomekeyring
+from dbus.mainloop.glib import DBusGMainLoop
+from ubuntuone.syncdaemon.tools import SyncDaemonTool, is_running
+from twisted.internet import defer
+
+def stage_two(node, sync_daemon_tool):
+    """do the last few checks and ask for a connect if all is ok"""
+    d = None
+    if node['node_id'] is not None:
+        items = gnomekeyring.find_items_sync(
+            gnomekeyring.ITEM_GENERIC_SECRET,
+            {'ubuntuone-realm': 'https://ubuntuone.com'})
+        if items:
+            d = sync_daemon_tool.connect()
+    if d is None:
+        d = defer.fail(RuntimeError("bad node"))
+    return d
+
+def main():
+    """Start syncdaemon and ask it to connect, if possible."""
+    gobject.set_application_name("ubuntuone-launch")
+    loop = DBusGMainLoop(set_as_default=True)
+    bus = dbus.SessionBus(mainloop=loop)
+    sync_daemon_tool = SyncDaemonTool(bus)
+
+    if not is_running():
+        try:
+            d = sync_daemon_tool.start()
+        except dbus.exception.DBusException, e:
+            d = defer.fail(e)
+    else:
+        d = defer.succeed(True)
+
+    d.addCallback(lambda _: sync_daemon_tool.get_metadata(U1ROOT))
+    d.addCallback(stage_two, sync_daemon_tool)
+    # os._exit feels like it's cheating, but it's simple and fast
+    d.addCallbacks(lambda _: os._exit(0), lambda _: os._exit(1))
+
+    mainloop = glib.MainLoop()
+    mainloop.run()
+
+if __name__ == '__main__':
+    main()

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-03-10 23:36:53 +0000
+++ bin/ubuntuone-preferences	2010-03-31 23:55:45 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
 #
@@ -23,37 +24,47 @@
 import pygtk
 pygtk.require('2.0')
 import gobject
-import glib
 import gtk
 import os
+import sys
+import time
 import gettext
 import gnomekeyring
-import httplib2
 import simplejson
+import subprocess
+from threading import Thread
 from oauth import oauth
 from ubuntuone import clientdefs
 from ubuntuone.syncdaemon.tools import SyncDaemonTool
-from ubuntuone.syncdaemon.logger import LOGFOLDER
+from ubuntuone.syncdaemon.logger import (basic_formatter, LOGFOLDER,
+                                         CustomRotatingFileHandler)
 
 import logging
-import sys
 import httplib, urlparse, socket
 
 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
 
-logging.basicConfig(
-    filename=os.path.join(LOGFOLDER, 'u1-prefs.log'),
-    level=logging.DEBUG,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger("ubuntuone-preferences")
+logger.setLevel(logging.DEBUG)
+handler = CustomRotatingFileHandler(filename=os.path.join(LOGFOLDER,
+                                                          'u1-prefs.log'))
+handler.setFormatter(basic_formatter)
+handler.setLevel(logging.DEBUG)
+logger.addHandler(handler)
+
+_ = gettext.gettext
+
+dcouch = None
+# Try importing the Ubuntu One desktopcouch enablement api
+try:
+    from desktopcouch.replication_services import ubuntuone as dcouch
+except ImportError:
+    logger.error(_("DesktopCouch replication API not found"))
+
 DBusGMainLoop(set_as_default=True)
 
-_ = gettext.gettext
-
 DBUS_IFACE_NAME = "com.ubuntuone.SyncDaemon"
 DBUS_IFACE_CONFIG_NAME = DBUS_IFACE_NAME + ".Config"
 DBUS_IFACE_STATUS_NAME = DBUS_IFACE_NAME + ".Status"
@@ -61,6 +72,12 @@
 DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
 DBUS_IFACE_AUTH_PATH = "/"
 
+# Our own DBus interface
+PREFS_BUS_NAME = "com.ubuntuone.Preferences"
+
+# This is where thy music lies
+U1MSPATH = os.path.expanduser("~/.ubuntuone/Purchased from Ubuntu One")
+
 # Why thank you GTK+ for enforcing style-set and breaking API
 RCSTYLE = """
 style 'dialogs' {
@@ -71,19 +88,87 @@
 widget_class '*Dialog*' style 'dialogs'
 """
 
-def dbus_async(*args):
-      """Simple handler to make dbus do stuff async."""
-      pass
-
+# Some defines for the bindwood installation magic
+BW_PKG_NAME = "xul-ext-bindwood"
+BW_INST_ARGS = ['apturl', 'apt:%s?section=universe' % BW_PKG_NAME]
+BW_CHCK_ARGS = ['dpkg', '-l', BW_PKG_NAME]
+
+# This is a global so we can avoid creating multiple instances in some cases
+prefs_dialog = None
+
+def dbus_async(*args, **kwargs):
+    """Simple handler to make dbus do stuff async."""
+    pass
+
+
+def do_login_request(bus, error_handler):
+    """Make a login request to the login handling daemon."""
+    try:
+        client = 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=error_handler)
+    except DBusException, e:
+        error_handler(e)
 
 def get_access_token(keyring):
-      items = []
-      items = keyring.find_items_sync(
+    """Get the access token from the keyring."""
+    items = []
+    try:
+        items = keyring.find_items_sync(
             keyring.ITEM_GENERIC_SECRET,
             {'ubuntuone-realm': "https://ubuntuone.com",
              'oauth-consumer-key': 'ubuntuone'})
-      secret = items[0].secret
-      return oauth.OAuthToken.from_string(secret)
+        secret = items[0].secret
+        return oauth.OAuthToken.from_string(secret)
+    except (gnomekeyring.NoMatchError, gnomekeyring.DeniedError):
+        return None
+
+def do_rest_request(url, method, token, callback):
+    """
+    Helper that handles the REST response.
+    """
+    result = None
+    consumer = oauth.OAuthConsumer('ubuntuone', 'hammertime')
+
+    oauth_request = oauth.OAuthRequest.from_consumer_and_token(
+        http_url=url,
+        http_method=method,
+        oauth_consumer=consumer,
+        token=token,
+        parameters='')
+    oauth_request.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(),
+                               consumer, token)
+
+    scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
+
+    conn = httplib.HTTPSConnection(netloc)
+    try:
+        conn.request(method, path, headers=oauth_request.to_header())
+        response = conn.getresponse() # shouldn't block
+        if response.status == 200:
+            data = response.read() # neither should this
+            result = simplejson.loads(data)
+        else:
+            result = {'status' : response.status,
+                      'reason' : response.reason}
+    except socket.error, e:
+        result = {'error' : e}
+
+    gtk.gdk.threads_enter()
+    callback(result)
+    gtk.gdk.threads_leave()
+
+def make_rest_request(url=None, method='GET',
+                      callback=None, keyring=None):
+    """
+    Helper that makes an oauth-wrapped REST request.
+    """
+    token = get_access_token(keyring)
+    Thread(target=do_rest_request, args=(url, method, token, callback)).start()
 
 
 class DevicesWidget(gtk.Table):
@@ -125,8 +210,8 @@
         self.status_label = gtk.Label("")
         self.attach(self.status_label, 0, 3, 2, 3)
 
-        self.description = gtk.Label(_("The devices connected to with your"
-                                       " personal cloud network"
+        self.description = gtk.Label(_("The devices connected with your"
+                                       " pseronal cloud network"
                                        " are listed below"))
         self.description.set_alignment(0., .5)
         self.description.set_line_wrap(True)
@@ -227,34 +312,6 @@
         self.status_label.set_markup("<b>Error:</b> %s" % msg)
         logger.error(msg)
 
-    def request(self, path='', method='GET'):
-        """
-        Helper that makes an oauth-wrapped rest request.
-
-        XXX duplication with request_REST_info (but this one should be async).
-        """
-        url = self.base_url + path
-
-        token = get_access_token(self.keyring)
-
-        oauth_request = oauth.OAuthRequest.from_consumer_and_token(
-            http_url=url,
-            http_method=method,
-            oauth_consumer=self.consumer,
-            token=token,
-            parameters='')
-        oauth_request.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(),
-                                   self.consumer, token)
-
-        scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
-
-        conn = httplib.HTTPSConnection(netloc)
-        try:
-            conn.request(method, path, headers=oauth_request.to_header())
-        except socket.error:
-            return None
-        return conn
-
     def get_devices(self):
         """
         Ask the server for a list of devices
@@ -262,36 +319,38 @@
         Hook up parse_devices to run on the result (when it gets here).
         """
         try:
-            token = get_access_token(self.keyring)
+            get_access_token(self.keyring)
         except gnomekeyring.NoMatchError:
             self.error("No token in the keyring")
-            self.devices = []
+            self.devices = None
         else:
-            self.consumer = oauth.OAuthConsumer("ubuntuone", "hammertime")
-
-            self.conn = self.request()
-            if self.conn is None:
-                self.clear_devices_view()
-                self.error('Unable to connect')
-            else:
-                glib.io_add_watch(
-                    self.conn.sock,
-                    glib.IO_IN | glib.IO_PRI | glib.IO_ERR | glib.IO_HUP,
-                    self.parse_devices)
-
-    def parse_devices(self, *a):
+            make_rest_request(url=self.base_url, keyring=self.keyring,
+                              callback=self.parse_devices)
+
+    def parse_devices(self, result):
         """
         Parse the list of devices, and hook up list_devices if it worked.
         """
-        response = self.conn.getresponse() # shouldn't block
-        if response.status == 200:
-            response = response.read() # neither should this
-            self.devices = simplejson.loads(response)
-            gobject.idle_add(self.list_devices)
+        is_error = False
+        error = None
+        if result and isinstance(result, list):
+            self.devices = result
+        elif isinstance(result, dict):
+            error = result.get('error', None)
+            if not error and result.get('status', None):
+                is_error = True
+                error = result.get('reason', None)
+            else:
+                is_error = True
         else:
-            self.clear_devices_view()
-            self.error(response.reason)
-        return False
+            error = "Got empty result for devices list."
+            is_error = True
+
+        if is_error:
+            self.devices = None
+            self.error(error)
+
+        gobject.idle_add(self.list_devices)
 
     def clear_devices_view(self):
         """
@@ -315,8 +374,6 @@
         If the list of devices is empty, make a fake one that refers
         to the local machine (to get the connect/restart buttons).
         """
-        self.resize(len(self.devices)+1, 3)
-
         self.clear_devices_view()
 
         token = get_access_token(self.keyring)
@@ -325,8 +382,10 @@
             # a stopgap device so you can at least try to connect
             self.devices = [{'kind': 'Computer',
                              'description': _("<LOCAL MACHINE>"),
-                             'token': token.key,
+                             'token': token.key if token else '',
                              'FAKE': 'YES'}]
+        else:
+            self.resize(len(self.devices)+1, 3)
 
         self.status_label.set_label("")
 
@@ -340,17 +399,18 @@
             self.attach(img, 0, 1, i, i+1)
             self.attach(desc, 1, 2, i, i+1)
             if 'FAKE' not in row:
-                  # we don't include the "Remove" button for the fake entry :)
-                  butn = gtk.Button(_('Remove'))
-                  butn.connect('clicked', self.remove,
-                               row['kind'], row.get('token'))
-                  self.attach(butn, 2, 3, i, i+1, xoptions=0, yoptions=0)
-            if row.get('token') == token.key:
+                # we don't include the "Remove" button for the fake entry :)
+                butn = gtk.Button(_("Remove"))
+                butn.connect('clicked', self.remove,
+                             row['kind'], row.get('token'))
+                self.attach(butn, 2, 3, i, i+1, xoptions=0, yoptions=0)
+            if token and row.get('token') == token.key or 'FAKE' in row:
                 self.bw_chk = ck_btn = gtk.CheckButton(
-                      _("_Limit Bandwidth Usage"))
+                    _("_Limit Bandwidth Usage"))
                 ck_btn.set_active(self.bw_limited)
                 up_lbl = gtk.Label(_("Maximum _upload speed (KB/s):"))
                 up_lbl.set_alignment(0., .5)
+                up_lbl.set_use_underline(True)
                 adj = gtk.Adjustment(value=self.up_limit/1024.,
                                      lower=0.0, upper=4096.0,
                                      step_incr=1.0, page_incr=16.0)
@@ -359,6 +419,7 @@
                 up_lbl.set_mnemonic_widget(up_btn)
                 dn_lbl = gtk.Label(_("Maximum _download speed (KB/s):"))
                 dn_lbl.set_alignment(0., .5)
+                dn_lbl.set_use_underline(True)
                 adj = gtk.Adjustment(value=self.dn_limit/1024.,
                                      lower=0.0, upper=4096.0,
                                      step_incr=1.0, page_incr=16.0)
@@ -370,13 +431,13 @@
                 self.handle_bw_checkbox_toggled(ck_btn,
                                                 up_lbl, up_btn, dn_lbl, dn_btn)
 
-                self.conn_btn = gtk.Button(_('Connect'))
+                self.conn_btn = gtk.Button(_("Connect"))
                 if self.connected is None:
                     self.conn_btn.set_sensitive(False)
                 elif self.connected:
-                    self.conn_btn.set_label(_('Disconnect'))
+                    self.conn_btn.set_label(_("Disconnect"))
                 self.conn_btn.connect('clicked', self.handle_connect_button)
-                restart_btn = gtk.Button(_('Restart'))
+                restart_btn = gtk.Button(_("Restart"))
                 restart_btn.connect('clicked', self.handle_restart_button)
                 btn_box = gtk.HButtonBox()
                 btn_box.add(self.conn_btn)
@@ -401,9 +462,9 @@
         """
         self.conn_btn.set_sensitive(False)
         if self.connected:
-            d = self.sdtool.disconnect()
+            self.sdtool.disconnect()
         else:
-            d = self.sdtool.connect()
+            self.sdtool.connect()
 
     def handle_restart_button(self, *a):
         """
@@ -417,402 +478,657 @@
 
         Starts an async request to remove a device.
         """
-        self.conn = self.request('remove/%s/%s' % (kind.lower(), token))
-        if self.conn is None:
-            self.clear_devices_view()
-            self.error('Unable to connect')
-        else:
-            glib.io_add_watch(
-                self.conn.sock,
-                glib.IO_IN | glib.IO_PRI | glib.IO_ERR | glib.IO_HUP,
-                self.parse_devices)
+        make_rest_request(url=('%sremove/%s/%s' % (self.base_url,
+                                                   kind.lower(), token)),
+                          keyring=self.keyring,
+                          callback=self.parse_devices)
+        local = get_access_token(self.keyring)
+        def local_removal_cb(*args, **kwargs):
+            """Try to get a new token if we remove the local one."""
+            do_login_request(self.bus, self.error)
 
+        if token == local.key:
+            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.clear_token('https://ubuntuone.com', 'ubuntuone',
+                                  reply_handler=local_removal_cb,
+                                  error_handler=self.error)
+            except DBusException, e:
+                self.error(e)
 
 
 class UbuntuOneDialog(gtk.Dialog):
-      """Preferences dialog."""
-
-      def __init__(self, config=None, keyring=gnomekeyring, *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.__bus = dbus.SessionBus()
-            self.keyring = keyring
-
-            self.__bus.add_signal_receiver(
-                  handler_function=self.__got_state,
-                  signal_name='StatusChanged',
-                  dbus_interface=DBUS_IFACE_STATUS_NAME)
-
-            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
-
-            # SD Tool object
-            self.sdtool = SyncDaemonTool(self.__bus)
-            self.sdtool.get_status().addCallbacks(lambda _: self.__got_state,
-                                                  self.__sd_error)
-            # Build the dialog
-            self.__construct()
-            logger.debug("starting")
-
-      def quit(self):
-            """Exit the main loop."""
-            gtk.main_quit()
-
-      def __dbus_error(self, error):
-            """Error getting throttling config."""
-            print repr(error)
-
-      def __sd_error(self, error):
-            """Error talking to syncdaemon."""
-            print repr(error)
-
-      def __got_state(self, state):
-            """Got the state of syncdaemon."""
-            self.devices.handle_state_change(state)
-
-      def __got_limits(self, limits):
-            """Got the throttling limits."""
-            logger.debug("got limits: %s" % (limits,))
-            self.devices.handle_limits(limits)
-
-      def __got_enabled(self, enabled):
-            """Got the throttling enabled config."""
-            self.devices.handle_throttling_enabled(enabled)
-
-      def __handle_response(self, dialog, response):
-            """Handle the dialog's response."""
-            self.hide()
-            self.devices.update_bw_settings()
-            gtk.main_quit()
-
-      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")
-            token = get_access_token(self.keyring)
-            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
-            self.devices = DevicesWidget(self.__bus, self.keyring)
-            self.notebook.append_page(self.devices)
-            self.notebook.set_tab_label_text(self.devices, _("Devices"))
-            self.devices.show_all()
-            self.devices.get_devices()
-
-            # 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)
+    """Preferences dialog."""
+
+    def __init__(self, config=None, keyring=gnomekeyring, *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.set_default_size(400, 300)
+
+        self.connect("close", self.__handle_response, gtk.RESPONSE_CLOSE)
+        self.connect("response", self.__handle_response)
+
+        # desktopcouch ReplicationExclusion, or None
+        self.dcouch = None
+
+        # folder id for dealing with the Music folder
+        self.ums_id = None
+
+        self.__bus = dbus.SessionBus()
+        self.keyring = keyring
+
+        # Timeout ID to avoid spamming DBus from spinbutton changes
+        self.__update_id = 0
+
+        # Build the dialog
+        self.__construct()
+
+        # SD Tool object
+        self.sdtool = SyncDaemonTool(self.__bus)
+        self.sdtool.get_status().addCallbacks(self.__got_state,
+                                              self.__sd_error)
+
+        # hook dbus up
+        self.__bus.add_signal_receiver(
+            handler_function=self.__got_state,
+            signal_name='StatusChanged',
+            dbus_interface=DBUS_IFACE_STATUS_NAME)
+
+        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)
+
+        logger.debug("starting")
+
+    def __dbus_error(self, error):
+        """Error getting throttling config."""
+        logger.error(error)
+
+    def __sd_error(self, error):
+        """Error talking to syncdaemon."""
+        logger.error(error)
+
+    def __got_state(self, state):
+        """Got the state of syncdaemon."""
+        if not state['is_connected']:
+            self.status_label.set_text(_("Disconnected"))
+        else:
+            try:
+                status = state['name']
+                queues = state['queues']
+            except KeyError:
+                status = None
+                queues = None
+            if status == u'QUEUE_MANAGER' and queues == u'IDLE':
+                self.status_label.set_text(_("Synchronization complete"))
+            else:
+                self.status_label.set_text(_(u"Synchronization in progress…"))
+
+        # Update the stuff in the devices tab
+        self.devices.handle_state_change(state)
+
+    def __got_limits(self, limits):
+        """Got the throttling limits."""
+        logger.debug("got limits: %s" % (limits,))
+        self.devices.handle_limits(limits)
+
+    def __got_enabled(self, enabled):
+        """Got the throttling enabled config."""
+        self.devices.handle_throttling_enabled(enabled)
+
+    def __handle_response(self, dialog, response):
+        """Handle the dialog's response."""
+        self.hide()
+        self.devices.handle_bw_controls_changed()
+        gtk.main_quit()
+
+    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)
+
+        # assumes all paid accounts will have more than 50GB
+        is_paid_account = total >= 50<<30
+        self.plan_label.set_label(_("Paid") if is_paid_account else _("Free"))
+        if is_paid_account:
+            self.upgrade_link.hide()
+        else:
+            self.upgrade_link.show()
+
+        if percent >= 100.:
+            self.overquota_img.set_from_icon_name('dialog-warning',
+                                                  gtk.ICON_SIZE_DIALOG)
+            self.overquota.show_all()
+            label = _("You are using all of your Ubuntu One storage.")
+            if is_paid_account:
+                desc = _("Synchronization is now disabled. Remove files from"
+                         " synchronization or upgrade your subscription. Use"
+                         " the Support options if an upgrade is not available.")
+            else:
+                desc = _("Synchronization is now disabled. Remove files from"
+                         " synchronization or upgrade your subscription.")
+        elif percent >= 95.:
+            self.overquota_img.set_from_icon_name('dialog-information',
+                                                  gtk.ICON_SIZE_DIALOG)
+            self.overquota.show_all()
+            label = _("You are near your Ubuntu One storage limit.")
+            if is_paid_account:
+                desc = _("Automatic synchronization will stop when you reach"
+                         " your storage limit.")
+            else:
+                desc = _("Automatic synchronization will stop when you reach"
+                         " your storage limit. Please consider upgrading to"
+                         " avoid a service interruption.")
+        else:
+            self.overquota_img.clear()
+            label = desc = ""
+            self.overquota.hide_all()
+        self.overquota_label.set_markup("%s\n<small>%s</small>" % (label, desc))
+
+    def got_quota_info(self, quota):
+        """Handle the result from the quota REST call."""
+        if quota:
+            used = quota.get('used', 0)
+            total = quota.get('total', 2)
+            self.update_quota_display(used, total)
+
+    def request_quota_info(self):
+        """Request new quota info from server, and update display."""
+        make_rest_request(url='https://one.ubuntu.com/api/quota/',
+                          keyring=self.keyring,
+                          callback=self.got_quota_info)
+
+    def got_account_info(self, user):
+        """Handle the result from the account REST call."""
+        if user:
+            self.name_label.set_text(user.get('nickname', _("Unknown")))
+            self.mail_label.set_text(user.get('email', _("Unknown")))
+
+    def request_account_info(self):
+        """Request account info from server, and update display."""
+        make_rest_request(url='https://one.ubuntu.com/api/account/',
+                          keyring=self.keyring,
+                          callback=self.got_account_info)
+
+    def __bw_inst_cb(self, button):
+        """Pops off the bindwood installer to a thread."""
+        Thread(target=self.__install_bindwood).start()
+
+    def __install_bindwood(self):
+        """Runs the tool to intall bindwood and updates the UI."""
+        installed = subprocess.call(BW_INST_ARGS)
+        gtk.gdk.threads_enter()
+        if installed == 0:
+            self.bw_inst_box.hide()
+        else:
+            self.bw_inst_box.show()
+            logger.error(_("There was an error installing bindwood."))
+        gtk.gdk.threads_leave()
+
+    def __check_for_bindwood(self):
+        """
+        Method run in a thread to check that bindwood exists, and
+        update the interface appropriately.
+        """
+        exists = True
+        p = subprocess.Popen(BW_CHCK_ARGS, bufsize=4096,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                             stdin=subprocess.PIPE, env=os.environ)
+        result = p.wait()
+        if result == 0:
+            for line in p.stdout.readlines():
+                if line.startswith('un'):
+                    exists = False
+        else:
+            exists = False
+
+        gtk.gdk.threads_enter()
+        if exists:
+            self.bw_inst_box.hide()
+        else:
+            self.bw_inst_btn.connect("clicked",
+                                     self.__bw_inst_cb)
+            self.bw_inst_box.show()
+        gtk.gdk.threads_leave()
+
+    def connect_desktopcouch_exclusion(self):
+        """Hook up to desktopcouch enablement API, or disable the UI."""
+        # Hook up to desktopcouch, or die trying
+        if dcouch:
+            Thread(target=self.__check_for_bindwood).start()
+
+            self.dcouch = dcouch.ReplicationExclusion()
+            exclusions = self.dcouch.all_exclusions()
+            for check in [self.bookmarks_check,
+                          self.abook_check,
+                          self.gwib_check]:
+                if check.get_data('dbname') in exclusions:
+                    check.set_active(False)
+                else:
+                    check.set_active(True)
+        else:
+            self.bookmarks_check.set_sensitive(False)
+            self.abook_check.set_sensitive(False)
+            self.gwib_check.set_sensitive(False)
+
+    def toggle_db_sync(self, dbname, disable=False):
+        """
+        Toggle whether a db in desktopcouch is synchronized to the
+        Ubuntu One couchdb server.
+        """
+        if self.dcouch:
+            if disable:
+                self.dcouch.exclude(dbname)
+            else:
+                self.dcouch.replicate(dbname)
+        else:
+            logger.error(_("Database enablement is unavailable."))
+
+    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."""
+        enabled = checkbutton.get_active()
+        self.sdtool.enable_files_sync(enabled).addCallbacks(
+            lambda _: dbus_async,
+            self.__sd_error)
+        def sd_error(error):
+            self.files_check.set_active(False)
+            self.files_check.set_sensitive(False)
+            self.music_check.set_sensitive(False)
+            self.__sd_error(error)
+
+        if enabled:
+            self.sdtool.start().addErrback(sd_error)
+            if self.ums_id:
+                self.music_check.set_sensitive(True)
+                if self.music_check.get_active():
+                    self.__music_check_toggled(self.music_check)
+        else:
+            self.sdtool.quit()
+            self.music_check.set_sensitive(False)
+
+    def music_check_toggled(self, checkbutton):
+        """Handle toggling the music download service."""
+        if not self.files_check.get_active() or not self.ums_id:
+            return
+        enabled = checkbutton.get_active()
+        def got_error(error):
+            checkbutton.set_sensitive(False)
+            checkbutton.set_active(not enabled)
+            self.__sd_error(error)
+
+        if enabled:
+            d = self.sdtool.subscribe_folder(self.ums_id)
+        else:
+            d = self.sdtool.unsubscribe_folder(self.ums_id)
+        d.addErrback(got_error)
+
+    def get_syncdaemon_sync_config(self):
+        """Update the files/music sync config from syncdaemon."""
+        def got_fs_err(error):
+            self.files_check.set_sensitive(False)
+            self.music_check.set_sensitive(False)
+            self.__sd_error(error)
+
+        def got_ms_err(error):
+            self.music_check.set_sensitive(False)
+            self.__sd_error(error)
+
+        def got_info(info):
+            if not info:
+                self.music_check.set_active(False)
+                self.music_check.set_sensitive(False)
+            else:
+                self.ums_id = info['volume_id']
+                self.music_check.set_sensitive(True)
+                if info['subscribed'] == 'True':
+                    self.music_check.set_active(True)
+                else:
+                    self.music_check.set_active(False)
+
+        def got_fs(enabled):
+            self.files_check.set_active(enabled)
+
+        self.sdtool.get_folder_info(U1MSPATH).addCallbacks(got_info, got_ms_err)
+        self.sdtool.is_files_sync_enabled().addCallbacks(got_fs, got_fs_err)
+
+    def connect_file_sync_callbacks(self):
+        """Connect the file sync checkbox callbacks."""
+        self.files_check.connect('toggled', self.files_check_toggled)
+        self.music_check.connect('toggled', self.music_check_toggled)
+
+    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
+        rbox = gtk.VBox(spacing=12)
+        vbox.pack_start(rbox, False, False)
+        rbox.show()
+
+        hbox = gtk.HBox(spacing=6)
+        rbox.pack_start(hbox, False, False)
+        hbox.show()
+
+        self.usage_graph = gtk.ProgressBar()
+        hbox.pack_start(self.usage_graph, False, False)
+        self.usage_graph.show()
+
+        self.usage_label = gtk.Label(_("Unknown"))
+        self.usage_label.set_alignment(0.0, 0.5)
+        hbox.pack_start(self.usage_label, False, False)
+        self.usage_label.show()
+
+        self.status_label = gtk.Label(_("Unknown"))
+        self.status_label.set_alignment(0.0, 0.5)
+        rbox.pack_start(self.status_label, False, False)
+        self.status_label.show()
+
+        # 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()
+
+        # overquota notice in account tab
+        self.overquota = gtk.HBox(spacing=6)
+        self.overquota.set_border_width(6)
+        account.pack_start(self.overquota, False, False)
+
+        self.overquota_img = gtk.Image()
+        self.overquota.pack_start(self.overquota_img, False, False)
+        self.overquota_img.show()
+
+        self.overquota_label = label = gtk.Label("\n\n")
+        label.set_line_wrap(True)
+        label.set_alignment(0.0, 0.5)
+        self.overquota.pack_start(label, False, False)
+        self.overquota_label.show()
+
+
+        # User info in account tab
+        table = gtk.Table(rows=6, 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(_("Unknown"))
+        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(_("_E-mail:"))
+        label.set_use_underline(True)
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 1, 2)
+        label.show()
+
+        self.mail_label = gtk.Label(_("Unknown"))
+        self.mail_label.set_use_underline(True)
+        self.mail_label.set_alignment(0.0, 0.5)
+        table.attach(self.mail_label, 1, 2, 1, 2)
+        self.mail_label.show()
+
+        label = gtk.Label(_("Current plan:"))
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 2, 3)
+        label.show()
+
+        self.plan_label = gtk.Label(_("Unknown"))
+        self.plan_label.set_alignment(0.0, 0.5)
+        table.attach(self.plan_label, 1, 2, 2, 3)
+        self.plan_label.show()
+
+        for n, (url, label) in enumerate([
+                ("http://one.ubuntu.com/support", _("Support options")),
+                ("http://one.ubuntu.com/account", _("Manage account")),
+                ("http://one.ubuntu.com/upgrade",
+                 _("Upgrade your subscription")),
+            ]):
+            link = gtk.LinkButton(url, label)
+            link.set_relief(gtk.RELIEF_NONE)
+            link.set_alignment(0.0, 0.5)
+            table.attach(link, 0, 2, 5-n, 6-n)
+            link.show()
+        self.upgrade_link = link
+        self.upgrade_link.hide()
+
+        # Devices tab
+        sw = gtk.ScrolledWindow()
+        sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        self.notebook.append_page(sw)
+        self.notebook.set_tab_label_text(sw, _("Devices"))
+        sw.show()
+        self.devices = DevicesWidget(self.__bus, self.keyring)
+        sw.add_with_viewport(self.devices)
+        self.devices.show_all()
+
+        # 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"))
+        services.show()
+
+        label = gtk.Label()
+        label.set_markup(
+            _("Ubuntu One sync options\n"
+              "<small>Choose services to synchronize"
+              " with this computer</small>"))
+        label.set_alignment(0., .5)
+        label.set_padding(12, 6)
+        label.set_line_wrap(True)
+        services.pack_start(label, False, False)
+        label.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()
+
+        # This box is shown in the event bindwood is not installed
+        self.bw_inst_box = gtk.HBox(spacing=12)
+        services.pack_start(self.bw_inst_box, False, False)
+
+        label = gtk.Label("")
+        self.bw_inst_box.pack_start(label, False, False)
+        label.show()
+
+        label = gtk.Label("<i>%s</i>" % _("Firefox extension not installed."))
+        label.set_use_markup(True)
+        label.set_alignment(0.0, 0.5)
+        self.bw_inst_box.pack_start(label, False, False)
+        label.show()
+
+        self.bw_inst_btn = gtk.Button(_("_Install"))
+        self.bw_inst_box.pack_start(self.bw_inst_btn, False, False)
+        self.bw_inst_btn.show()
+
+        self.gwib_check = gtk.CheckButton(_("Broadcast Messages _Archive"))
+        self.gwib_check.set_data('dbname', 'gwibber_messages')
+        self.gwib_check.connect('toggled', self.__db_check_toggled)
+        services.pack_start(self.gwib_check, False, False)
+        self.gwib_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)
+        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)
+        alignment.add(self.music_check)
+        self.music_check.show()
+
+
+class UbuntuoneLoginHandler(dbus.service.Object):
+    """Class to handle registration/login, in case we aren't already."""
+
+    def __init__(self, dialog, *args, **kw):
+        self.bus = dbus.SessionBus()
+
+        # The actual UI
+        self.dialog = dialog
+
+        # DBus object magic
+        self.path = '/'
+        bus_name = dbus.service.BusName(PREFS_BUS_NAME, bus=self.bus)
+        dbus.service.Object.__init__(self, bus_name=bus_name,
+                                     object_path=self.path)
+
+
+    @dbus.service.method(PREFS_BUS_NAME, in_signature='', out_signature='')
+    def present(self):
+        """Raise the dialog window."""
+        self.dialog.connect_desktopcouch_exclusion()
+        self.dialog.get_syncdaemon_sync_config()
+        self.dialog.connect_file_sync_callbacks()
+        self.dialog.request_quota_info()
+        self.dialog.request_account_info()
+        self.dialog.devices.get_devices()
+        self.dialog.present_with_time(int(time.time()))
+
+    def got_newcredentials(self, realm, consumer_key):
+        """Show our dialog, since we can do stuff now."""
+        self.present()
+
+    def got_oautherror(self, message=None):
+        """Got an error during oauth."""
+        if message:
+            logger.error(message)
+        else:
+            logger.error(_("OAuthError with no message."))
+
+    def got_authdenied(self):
+        """User denied access."""
+        logger.error(_("Authorization was denied."))
+
+    def got_dbus_error(self, error):
+        """Got a DBusError."""
+        logger.error(error)
+
+    def register_signal_handlers(self):
+        """Register the dbus signal handlers."""
+        self.bus.add_signal_receiver(
+            handler_function=self.got_newcredentials,
+            signal_name='NewCredentials',
+            dbus_interface=DBUS_IFACE_AUTH_NAME)
+        self.bus.add_signal_receiver(
+            handler_function=self.got_oautherror,
+            signal_name='OAuthError',
+            dbus_interface=DBUS_IFACE_AUTH_NAME)
+        self.bus.add_signal_receiver(
+            handler_function=self.got_authdenied,
+            signal_name='AuthorizationDenied',
+            dbus_interface=DBUS_IFACE_AUTH_NAME)
 
 
 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
+    gettext.bindtextdomain(clientdefs.GETTEXT_PACKAGE, clientdefs.LOCALEDIR)
+    gettext.textdomain(clientdefs.GETTEXT_PACKAGE)
+
+    gobject.threads_init()
+    gtk.gdk.threads_init()
+
+    gtk.rc_parse_string(RCSTYLE)
+    gobject.set_application_name("ubuntuone-preferences")
+
+    bus = dbus.SessionBus()
+    result = bus.request_name(PREFS_BUS_NAME,
+                              dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
+    if result == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
+        try:
+            client = bus.get_object(PREFS_BUS_NAME, '/',
+                                    follow_name_owner_changes=True)
+            iface= dbus.Interface(client, PREFS_BUS_NAME)
+            iface.present()
+        except DBusException, e:
+            logger.error(e)
+        sys.exit(0)
+
+    try:
+        # The prefs dialog
+        gtk.gdk.threads_enter()
+        prefs_dialog = UbuntuOneDialog()
+        prefs_dialog.show()
+
+        login = UbuntuoneLoginHandler(dialog=prefs_dialog)
+        login.register_signal_handlers()
+        gobject.timeout_add_seconds(1, do_login_request,
+                                    bus, login.got_dbus_error)
+        gtk.main()
+        gtk.gdk.threads_leave()
+    except KeyboardInterrupt:
+        pass

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2010-03-04 16:47:43 +0000
+++ bin/ubuntuone-syncdaemon	2010-03-31 23:55:45 +0000
@@ -25,7 +25,6 @@
 import dbus
 import dbus.mainloop.glib
 import gobject
-import logging
 import os
 import signal
 import sys
@@ -34,15 +33,10 @@
 from ubuntuone.syncdaemon import dbus_interface, logger, config
 from ubuntuone.syncdaemon.config import (
     get_config_files,
-    get_parsers,
-    xdg_cache_dir_parser,
-    xdg_data_dir_parser,
-    home_dir_parser,
 )
 
 from ubuntuone.syncdaemon.main import Main
 
-from configglue import configglue
 from twisted.internet import reactor
 from xdg.BaseDirectory import (
     xdg_cache_home, 
@@ -95,6 +89,10 @@
     if is_already_running():
         die('Another instance is running')
 
+    # check if the user disabled files sync
+    if not config.get_user_config().get_files_sync_enabled():
+        die('Files synchronization is disabled.')
+
     # check if we are using xdg_data_home and it doesn't exists
     if xdg_data_home in options.data_dir and \
        not os.path.exists(options.data_dir):
@@ -132,7 +130,8 @@
                 shares_symlink_name='Shared With Me',
                 read_limit=options.bandwidth_throttling_read_limit, 
                 write_limit=options.bandwidth_throttling_write_limit, 
-                throttling_enabled=options.bandwidth_throttling_on)
+                throttling_enabled=options.bandwidth_throttling_on,
+                ignore_files=options.ignore)
     if options.oauth:
         try:
             (key, secret) = options.oauth.split(':', 2)
@@ -164,6 +163,9 @@
         except ImportError:
             logger.root_logger.warning('guppy-pe/heapy not available, remote '
                                        'monitor thread not started')
+        else:
+            guppy.heapy.RM.on()
+
     main.start()
     if options.debug_lsprof_file:
         try:

=== modified file 'configure'
--- configure	2010-03-10 23:36:53 +0000
+++ configure	2010-03-31 23:55:45 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.1.4.
+# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.1.90.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='ubuntuone-client'
 PACKAGE_TARNAME='ubuntuone-client'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='ubuntuone-client 1.1.4'
+PACKAGE_VERSION='1.1.90'
+PACKAGE_STRING='ubuntuone-client 1.1.90'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1476,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.4 to adapt to many kinds of systems.
+\`configure' configures ubuntuone-client 1.1.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1547,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ubuntuone-client 1.1.4:";;
+     short | recursive ) echo "Configuration of ubuntuone-client 1.1.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ubuntuone-client configure 1.1.4
+ubuntuone-client configure 1.1.90
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1938,7 +1938,7 @@
 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.4, which was
+It was created by ubuntuone-client $as_me 1.1.90, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2748,7 +2748,7 @@
 
 # Define the identity of the package.
  PACKAGE='ubuntuone-client'
- VERSION='1.1.4'
+ VERSION='1.1.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12972,7 +12972,7 @@
 # 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.4, which was
+This file was extended by ubuntuone-client $as_me 1.1.90, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13038,7 +13038,7 @@
 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.4
+ubuntuone-client config.status 1.1.90
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-03-10 23:36:53 +0000
+++ configure.ac	2010-03-31 23:55:45 +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.4])
+AC_INIT([ubuntuone-client], [1.1.90])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'contrib/__init__.pyc'
Binary files contrib/__init__.pyc	2010-03-10 23:36:53 +0000 and contrib/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'contrib/dbus_util.pyc'
Binary files contrib/dbus_util.pyc	2010-03-10 23:36:53 +0000 and contrib/dbus_util.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'contrib/mocker.py'
--- contrib/mocker.py	2009-06-30 12:00:00 +0000
+++ contrib/mocker.py	2010-03-31 23:55:45 +0000
@@ -1092,9 +1092,12 @@
 
     def __nonzero__(self):
         try:
-            return self.__mocker_act__("nonzero")
+            result = self.__mocker_act__("nonzero")
         except MatchError, e:
             return True
+        if type(result) is Mock:
+            return True
+        return result
 
     def __iter__(self):
         # XXX On py3k, when next() becomes __next__(), we'll be able

=== modified file 'contrib/mocker.pyc'
Binary files contrib/mocker.pyc	2010-03-10 23:36:53 +0000 and contrib/mocker.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'contrib/pylint-wrapper'
--- contrib/pylint-wrapper	2009-12-07 17:35:00 +0000
+++ contrib/pylint-wrapper	2010-03-31 23:55:45 +0000
@@ -71,7 +71,8 @@
     # pylint: disable-msg=W0612
     for root, dirs, files in os.walk(SRCDIR, topdown=False):
         for file in files:
-            if file.endswith(".py"):
+            path = "%s/" % root
+            if file.endswith(".py") or path.endswith("bin/"):
                 pyfiles.append(os.path.join(root, file))
 
     pyfiles.sort()

=== modified file 'contrib/testing/__init__.pyc'
Binary files contrib/testing/__init__.pyc	2010-03-10 23:36:53 +0000 and contrib/testing/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2010-03-10 23:36:53 +0000
+++ contrib/testing/testcase.py	2010-03-31 23:55:45 +0000
@@ -616,6 +616,30 @@
         self.remove_from_connection()
 
 
+class FakeLogger(object):
+    """Helper logging class."""
+    def __init__(self):
+        self.logged = dict(debug=[], warning=[], info=[])
+
+    def _log(self, log, txt, args):
+        """Really logs."""
+        if args:
+            txt = txt % args
+        log.append(txt)
+
+    def warning(self, txt, *args):
+        """WARNING logs."""
+        self._log(self.logged['warning'], txt, args)
+
+    def debug(self, txt, *args):
+        """DEBUG logs."""
+        self._log(self.logged['debug'], txt, args)
+
+    def info(self, txt, *args):
+        """INFO logs."""
+        self._log(self.logged['info'], txt, args)
+
+
 class Listener(object):
     """Helper class to gather events."""
 

=== modified file 'contrib/testing/testcase.pyc'
Binary files contrib/testing/testcase.pyc	2010-03-10 23:36:53 +0000 and contrib/testing/testcase.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-02-17 23:51:29 +0000
+++ data/Makefile.am	2010-03-31 23:55:45 +0000
@@ -23,6 +23,10 @@
 desktop_in_files = ubuntuone-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = ubuntuone-launch.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
 @INTLTOOL_DESKTOP_RULE@
 
 %.conf: %.conf.in
@@ -132,6 +136,7 @@
 	$(config_in_files)	\
 	$(memenu_in_files)	\
 	$(desktop_in_files)     \
+	$(autostart_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
 	$(icon_in_files)	\
@@ -144,6 +149,7 @@
 CLEANFILES =		\
 	$(memenu_DATA)	\
 	$(desktop_DATA) \
+	$(autostart_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\
 	hicolor

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2010-02-17 23:51:29 +0000
+++ data/Makefile.in	2010-03-31 23:55:45 +0000
@@ -70,12 +70,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(configdir)" \
-	"$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(memenudir)" "$(DESTDIR)$(oauthdir)" \
-	"$(DESTDIR)$(servicedir)"
-DATA = $(apport_DATA) $(config_DATA) $(crashdb_DATA) $(desktop_DATA) \
-	$(memenu_DATA) $(oauth_DATA) $(service_DATA)
+am__installdirs = "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(autostartdir)" \
+	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(crashdbdir)" \
+	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(memenudir)" \
+	"$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"
+DATA = $(apport_DATA) $(autostart_DATA) $(config_DATA) $(crashdb_DATA) \
+	$(desktop_DATA) $(memenu_DATA) $(oauth_DATA) $(service_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -237,6 +237,9 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = ubuntuone-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_in_files = ubuntuone-launch.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 hicolordir = $(datadir)/icons/hicolor
 privateiconsdir = $(pkgdatadir)/icons/hicolor
 emblem_in_files = \
@@ -258,6 +261,7 @@
 	$(config_in_files)	\
 	$(memenu_in_files)	\
 	$(desktop_in_files)     \
+	$(autostart_in_files)     \
 	$(service_in_files)	\
 	$(emblem_in_files)	\
 	$(icon_in_files)	\
@@ -270,6 +274,7 @@
 CLEANFILES = \
 	$(memenu_DATA)	\
 	$(desktop_DATA) \
+	$(autostart_DATA) \
 	$(service_DATA)	\
 	$(emblem_files)	\
 	hicolor
@@ -337,6 +342,26 @@
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(apportdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(apportdir)" && rm -f $$files
+install-autostartDATA: $(autostart_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(autostartdir)" || $(MKDIR_P) "$(DESTDIR)$(autostartdir)"
+	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || 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)$(autostartdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(autostartdir)" || exit $$?; \
+	done
+
+uninstall-autostartDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
 install-configDATA: $(config_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
@@ -501,7 +526,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(memenudir)" "$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"; do \
+	for dir in "$(DESTDIR)$(apportdir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(crashdbdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(memenudir)" "$(DESTDIR)$(oauthdir)" "$(DESTDIR)$(servicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -551,9 +576,10 @@
 
 info-am:
 
-install-data-am: install-apportDATA install-configDATA \
-	install-crashdbDATA install-data-local install-desktopDATA \
-	install-memenuDATA install-oauthDATA install-serviceDATA
+install-data-am: install-apportDATA install-autostartDATA \
+	install-configDATA install-crashdbDATA install-data-local \
+	install-desktopDATA install-memenuDATA install-oauthDATA \
+	install-serviceDATA
 
 install-dvi: install-dvi-am
 
@@ -598,29 +624,31 @@
 
 ps-am:
 
-uninstall-am: uninstall-apportDATA uninstall-configDATA \
-	uninstall-crashdbDATA uninstall-desktopDATA uninstall-local \
-	uninstall-memenuDATA uninstall-oauthDATA uninstall-serviceDATA
+uninstall-am: uninstall-apportDATA uninstall-autostartDATA \
+	uninstall-configDATA uninstall-crashdbDATA \
+	uninstall-desktopDATA uninstall-local uninstall-memenuDATA \
+	uninstall-oauthDATA uninstall-serviceDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	dist-hook distclean distclean-generic distclean-libtool \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-apportDATA install-configDATA \
-	install-crashdbDATA install-data install-data-am \
-	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-memenuDATA install-oauthDATA install-pdf \
+	install-am install-apportDATA install-autostartDATA \
+	install-configDATA install-crashdbDATA install-data \
+	install-data-am 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-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
+	uninstall-apportDATA uninstall-autostartDATA \
+	uninstall-configDATA uninstall-crashdbDATA \
+	uninstall-desktopDATA uninstall-local uninstall-memenuDATA \
+	uninstall-oauthDATA uninstall-serviceDATA
 
 
 %.menu: %.menu.in

=== modified file 'data/oauth_registration.d/ubuntuone'
--- data/oauth_registration.d/ubuntuone	2009-06-30 12:00:00 +0000
+++ data/oauth_registration.d/ubuntuone	2010-03-31 23:55:45 +0000
@@ -10,4 +10,14 @@
 exe_path = /usr/bin/python
 application_name = ubuntuone-syncdaemon
 
+[control-panel]
+realm = https://ubuntuone.com
+consumer_key = ubuntuone
+exe_path = /usr/bin/python
+application_name = ubuntuone-preferences
 
+[launcher]
+realm = https://ubuntuone.com
+consumer_key = ubuntuone
+exe_path = /usr/bin/python
+application_name = ubuntuone-launch

=== modified file 'data/source_ubuntuone-client.py'
--- data/source_ubuntuone-client.py	2009-09-28 18:15:00 +0000
+++ data/source_ubuntuone-client.py	2010-03-31 23:55:45 +0000
@@ -27,8 +27,10 @@
 # things we may want to collect for the report
 u1_client_log = os.path.join(u1_log_path, "syncdaemon.log")
 u1_except_log = os.path.join(u1_log_path, "syncdaemon-exceptions.log")
+u1_invalidnames_log = os.path.join(u1_log_path, "syncdaemon-invalid-names.log")
 u1_oauth_log = os.path.join(u1_log_path, "oauth-login.log")
 u1_u1sync_log = os.path.join(u1_log_path, "u1sync.log")
+u1_prefs_log = os.path.join(u1_log_path, "u1-prefs.log")
 u1_sd_conf = os.path.join("etc", "xdg", "ubuntuone", "syncdaemon.conf")
 u1_usersd_conf = os.path.join(u1_user_config_path, "syncdaemon.conf")
 u1_user_conf = os.path.join(u1_user_config_path, "ubuntuone-client.conf")
@@ -36,11 +38,20 @@
 
 def add_info(report):
     """add report info"""
-    attach_file_if_exists(report, u1_except_log)
-    attach_file_if_exists(report, u1_oauth_log)
-    attach_file_if_exists(report, u1_usersd_conf)
-    attach_file_if_exists(report, u1_sd_conf)
-    attach_file_if_exists(report, u1_user_conf)
+    attach_file_if_exists(report, u1_except_log,
+                                  "UbuntuOneSyncdaemonExceptionsLog")
+    attach_file_if_exists(report, u1_invalidnames_log,
+                                  "UbuntuOneSyncdaemonInvalidNamesLog")
+    attach_file_if_exists(report, u1_oauth_log,
+                                  "UbuntuOneOAuthLoginLog")
+    attach_file_if_exists(report, u1_prefs_log,
+                                  "UbuntuOnePreferencesLog")
+    attach_file_if_exists(report, u1_usersd_conf,
+                                  "UbuntuOneSyncdaemonConfig")
+    attach_file_if_exists(report, u1_sd_conf,
+                                  "UbuntuOneUserSyncdaemonConfig")
+    attach_file_if_exists(report, u1_user_conf,
+                                  "UbuntuOneClientConfig")
 
     if not apport.packaging.is_distro_package(report['Package'].split()[0]):
         report['ThirdParty'] = 'True'
@@ -62,4 +73,4 @@
         if version is None:
             version = 'N/A'
         versions += '%s %s\n' % (package, version)
-    report['UbuntuoneClientPackages'] = versions
+    report['UbuntuOneClientPackages'] = versions

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2010-03-04 16:47:43 +0000
+++ data/syncdaemon.conf	2010-03-31 23:55:45 +0000
@@ -14,6 +14,11 @@
 port.parser = int
 port.help = The port on which to connect to the server
 
+files_sync_enabled.default = True
+files_sync_enabled.action = store_true
+files_sync_enabled.parser = bool
+files_sync_enabled.help = Toggles synchronization of files (False disables syncdaemon entirely)
+
 root_dir.default = ~/Ubuntu One
 root_dir.parser = home_dir
 root_dir.help = Use the specified directory as the root
@@ -62,6 +67,17 @@
 udf_autosubscribe.help = Autosubsribe to new User Defined Folders, 'on' by default. 
                          (accepted values: 1/0, on/off, true/false and yes/no)
 
+ignore.parser = lines
+ignore.help = The list of (Python, not bash) regexes of the files that 
+              SD should ignore.
+ignore.default = \A#.*\Z
+                 \A.*~\Z
+                 \A.*\.py[oc]\Z
+                 \A.*\.sw[nop]\Z
+                 \A.*\.swpx\Z
+                 \A\..*\.tmp\Z
+
+
 [bandwidth_throttling]
 on.default = False
 on.parser = bool

=== added file 'data/ubuntuone-launch.desktop.in'
--- data/ubuntuone-launch.desktop.in	1970-01-01 00:00:00 +0000
+++ data/ubuntuone-launch.desktop.in	2010-03-31 23:55:45 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Ubuntu One
+Exec=/bin/sh -c '[ -d "$HOME/Ubuntu One" ] && ubuntuone-launch'
+Type=Application
+X-GNOME-Autostart-Delay=30
+Icon=ubuntuone
+Comment= 

=== modified file 'data/ubuntuone-preferences.desktop.in'
--- data/ubuntuone-preferences.desktop.in	2010-02-17 23:51:29 +0000
+++ data/ubuntuone-preferences.desktop.in	2010-03-31 23:55:45 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Ubuntu One
-Comment=Configure and manage your Ubuntu One account
+_Comment=Configure and manage your Ubuntu One account
 Exec=ubuntuone-preferences
 Icon=ubuntuone
 Terminal=false

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-11 00:04:35 +0000
+++ debian/changelog	2010-03-31 23:55:45 +0000
@@ -1,3 +1,16 @@
+ubuntuone-client (1.1.90-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Notify user when approaching and exceeding quota (LP: #540360)
+    - Add instructional text to ubuntuone-preferences (LP: #539676)
+    - UbuntuOne needs to autostart and connect by defualt (LP: #534707)
+    - Impossible to infer status of file synchronization (LP: #526084)
+    - Devices and Services tabs functionality and development (LP: #525803)
+  * Add debian/source/format.
+  * Remove python-httplib2 from the dependencies (LP: #535207)
+
+ -- Rodney Dawes <[e-mail]>  Wed, 31 Mar 2010 19:47:01 -0400
+
 ubuntuone-client (1.1.4-0ubuntu1) lucid; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2010-03-10 23:50:45 +0000
+++ debian/control	2010-03-31 23:55:45 +0000
@@ -41,7 +41,6 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  ubuntuone-client (= ${source:Version}),
  python-gtk2 (>= 2.10),
- python-httplib2,
  python-simplejson
 Replaces: ubuntuone-client (<= 1.1.1)
 Conflicts: ubuntuone-client (<= 1.1.1)

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-03-31 23:55:45 +0000
@@ -0,0 +1,2 @@
+3.0 (quilt)
+

=== modified file 'docs/states_manager.svg'
--- docs/states_manager.svg	2010-03-04 16:47:43 +0000
+++ docs/states_manager.svg	2010-03-31 23:55:45 +0000
@@ -33,10 +33,10 @@
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="728"
+     inkscape:window-width="1920"
+     inkscape:window-height="1010"
      inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-y="24"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -5733,6 +5733,46 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4002"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-857"
+       style="overflow:visible">
+      <path
+         id="path7114-41"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
+    <inkscape:perspective
+       id="perspective4069"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       inkscape:stockid="Arrow1Mend1u64"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend1u64-64"
+       style="overflow:visible">
+      <path
+         id="path7114-30"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill:#796a69;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+    </marker>
   </defs>
   <metadata
      id="metadata7">
@@ -5849,63 +5889,63 @@
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.61261"
-       y="556.11877"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.35968"
+       y="460.50702"
        id="text2467-1-5-4-7"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-9"
-         x="751.61261"
-         y="556.11877"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">3. SYS_NET_CONNECTED</tspan></text>
+         x="839.35968"
+         y="460.50702"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">3. SYS_NET_CONNECTED</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.82153"
-       y="576.80383"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.55328"
+       y="479.67267"
        id="text2467-1-5-4-4"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-1"
-         x="751.82153"
-         y="576.80383"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">4. SYS_USER_CONNECT</tspan></text>
+         x="839.55328"
+         y="479.67267"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">4. SYS_USER_CONNECT</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.60071"
-       y="638.85907"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.34869"
+       y="537.16943"
        id="text2467-1-5-4-5"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-3"
-         x="751.60071"
-         y="638.85907"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">7. SYS_CONNECTION_LOST</tspan></text>
+         x="839.34869"
+         y="537.16943"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">7. SYS_CONNECTION_LOST</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.57678"
-       y="597.48889"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.32654"
+       y="498.8382"
        id="text2467-1-5-4-3-8"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-38"
-         x="751.57678"
-         y="597.48889"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5. SYS_NET_DISCONNECTED</tspan></text>
+         x="839.32654"
+         y="498.8382"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5. SYS_NET_DISCONNECTED</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.63654"
-       y="618.17401"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.38184"
+       y="518.00385"
        id="text2467-1-5-4-4-0"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-1-3"
-         x="751.63654"
-         y="618.17401"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">6. SYS_USER_DISCONNECT</tspan></text>
+         x="839.38184"
+         y="518.00385"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">6. SYS_USER_DISCONNECT</tspan></text>
     <g
        id="g8266"
        transform="matrix(0.74658494,0,0,0.74658494,-0.8603134,-224.75307)">
@@ -6138,27 +6178,6 @@
          x="373.00955"
          sodipodi:role="line"
          id="tspan8676-1-0">AUTH_FAILED</tspan></text>
-    <g
-       id="g8763"
-       transform="translate(-571.53861,-16.17932)">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="rect8502-1-3-1-3"
-         d="m 687.97895,686.92944 19.03124,19.03125 -18.43749,18.4375 130.95537,0 -19.03125,-19.03125 18.4375,-18.4375 -130.95537,0 z"
-         style="opacity:0.80373798;color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.33651051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <text
-         sodipodi:linespacing="150%"
-         xml:space="preserve"
-         style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
-         x="753.75067"
-         y="709.81586"
-         id="text2429-9-7-7-2-2-4-3"><tspan
-           id="tspan8676-1-9"
-           sodipodi:role="line"
-           x="753.75067"
-           y="709.81586"
-           style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">UNKNOWN</tspan></text>
-    </g>
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="M 196.60308,507.23994 332.40207,379.84707"
@@ -6498,15 +6517,15 @@
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:19.21366692px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="751.64844"
-       y="659.54419"
+       style="font-size:17.80227852px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="839.39288"
+       y="556.33508"
        id="text2467-1-5-4-5-5"><tspan
          sodipodi:role="line"
          id="tspan2469-4-3-8-3-7"
-         x="751.64844"
-         y="659.54419"
-         style="font-size:12.22687912px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">8. SYS_HANDSHAKE_TIMEOUT</tspan></text>
+         x="839.39288"
+         y="556.33508"
+         style="font-size:11.328722px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">8. SYS_HANDSHAKE_TIMEOUT</tspan></text>
     <path
        style="color:#000000;fill:none;stroke:#000000;stroke-width:1.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#DotM);marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 172.15675,355.01368 21.74975,7.69663"
@@ -6599,22 +6618,6 @@
        style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc" />
     <path
-       style="color:#000000;fill:none;stroke:#967b71;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 41.694143,630.27619 C 191.18408,629.59254 179.79003,629.79207 183.20824,666.48091"
-       id="path8817-5-8-1-5-2"
-       sodipodi:nodetypes="cc" />
-    <text
-       sodipodi:linespacing="125%"
-       xml:space="preserve"
-       style="font-size:12.56705952px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
-       x="41.174591"
-       y="625.82983"
-       id="text2461-6-0-31-6-2"><tspan
-         sodipodi:role="line"
-         x="41.174591"
-         y="625.82983"
-         id="tspan2463-3-4-2-8-1">From any node</tspan></text>
-    <path
        transform="matrix(0.24411038,0,0,0.22458156,264.46156,450.51532)"
        d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
        sodipodi:ry="47.282387"
@@ -6635,16 +6638,6 @@
        style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc" />
     <path
-       transform="matrix(0.24411038,0,0,0.22458156,229.17074,569.22208)"
-       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
-       sodipodi:ry="47.282387"
-       sodipodi:rx="42.646858"
-       sodipodi:cy="407.55515"
-       sodipodi:cx="-190.05666"
-       id="path4627-2-8-0"
-       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
        transform="matrix(0.24411038,0,0,0.22458156,644.85465,391.20219)"
        d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
        sodipodi:ry="47.282387"
@@ -6767,26 +6760,26 @@
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:10.45871924999999969px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ff9d5b;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic;opacity:1"
-       x="944.04236"
-       y="682.54211"
+       style="font-size:9.69044781px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ff9d5b;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
+       x="1017.654"
+       y="577.64355"
        id="text2461-6-0-31-6-4-5"><tspan
          sodipodi:role="line"
-         x="944.04236"
-         y="682.54211"
+         x="1017.654"
+         y="577.64355"
          id="tspan18329"
-         style="font-size:10.45871924999999969px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ff9d5b;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic">Note: On all nodes 3 &amp; 4 do anything</tspan></text>
+         style="font-size:9.69044781px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ff9d5b;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic">Note: On all nodes 3 &amp; 4 do anything</tspan></text>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:10.45871924999999969px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
-       x="-551.41644"
-       y="739.90375"
+       style="font-size:9.69044781px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
+       x="-456.15012"
+       y="828.51099"
        id="text2461-6-0-31-6-4-5-3"
        transform="matrix(0,-1,1,0,0,0)"><tspan
          sodipodi:role="line"
-         x="-551.41644"
-         y="739.90375"
+         x="-456.15012"
+         y="828.51099"
          id="tspan18329-0">ConnectionManager</tspan></text>
     <g
        id="g18554"
@@ -6966,30 +6959,6 @@
            x="1138.0615"
            sodipodi:role="line">AQ.disconnect()</tspan></text>
     </g>
-    <g
-       id="g18776"
-       transform="translate(-1317.1307,149.4903)">
-      <rect
-         style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.847;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect5912-2-48-2-9-0"
-         width="129.83394"
-         height="19.030485"
-         x="1372.1442"
-         y="549.65802"
-         ry="4.5156531"
-         rx="4.5156531" />
-      <text
-         id="text2461-6-7-4-5-0"
-         y="562.5957"
-         x="1399.2255"
-         style="font-size:10.90068817px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
-         xml:space="preserve"
-         sodipodi:linespacing="125%"><tspan
-           id="tspan2463-3-5-2-7-1"
-           y="562.5957"
-           x="1399.2255"
-           sodipodi:role="line">main.restart()</tspan></text>
-    </g>
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
@@ -7383,18 +7352,6 @@
     <text
        sodipodi:linespacing="125%"
        xml:space="preserve"
-       style="font-size:16.76553154px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
-       x="102.40143"
-       y="647.05518"
-       id="text2467-1-5-4-7-3-64-9-9"><tspan
-         sodipodi:role="line"
-         id="tspan2469-4-3-8-9-0-4-4-7"
-         x="102.40143"
-         y="647.05518"
-         style="font-size:10.66897488px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">SYS_UNKNOWN_ERROR</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       xml:space="preserve"
        style="font-size:25.45085716px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
        x="234.69305"
        y="438.2403"
@@ -7404,5 +7361,140 @@
          x="234.69305"
          y="438.2403"
          style="font-size:16.19600105px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff6600;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">5,6</tspan></text>
+    <g
+       style="display:inline"
+       id="g8763-8"
+       transform="matrix(0.76886496,0,0,0.76886496,230.74978,145.34928)">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="rect8502-1-3-1-3-5"
+         d="m 687.97895,686.92944 19.03124,19.03125 -18.43749,18.4375 130.95537,0 -19.03125,-19.03125 18.4375,-18.4375 -130.95537,0 z"
+         style="opacity:0.80373798;color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.33651051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="150%"
+         xml:space="preserve"
+         style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         x="753.75067"
+         y="709.81586"
+         id="text2429-9-7-7-2-2-4-3-9"><tspan
+           id="tspan8676-1-9-7"
+           sodipodi:role="line"
+           x="753.75067"
+           y="709.81586"
+           style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">UNKNOWN</tspan></text>
+    </g>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:1.53772998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 702.24295,642.38627 c 114.93757,-0.52564 106.17709,-0.37222 108.80523,27.83654"
+       id="path8817-5-8-1-5-2-5"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:9.66237164px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
+       x="701.84351"
+       y="638.96759"
+       id="text2461-6-0-31-6-2-3"><tspan
+         sodipodi:role="line"
+         x="701.84351"
+         y="638.96759"
+         id="tspan2463-3-4-2-8-1-8">From any node</tspan></text>
+    <path
+       transform="matrix(0.18768792,0,0,0.17267289,846.38714,595.4439)"
+       d="m -147.4098,407.55515 a 42.646858,47.282387 0 1 1 -85.29371,0 42.646858,47.282387 0 1 1 85.29371,0 z"
+       sodipodi:ry="47.282387"
+       sodipodi:rx="42.646858"
+       sodipodi:cy="407.55515"
+       sodipodi:cx="-190.05666"
+       id="path4627-2-8-0-8"
+       style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <g
+       style="display:inline"
+       id="g18776-3"
+       transform="matrix(0.76886496,0,0,0.76886496,-342.50986,272.72685)">
+      <rect
+         style="opacity:0.65322583;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.847;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect5912-2-48-2-9-0-1"
+         width="129.83394"
+         height="19.030485"
+         x="1372.1442"
+         y="549.65802"
+         ry="4.5156531"
+         rx="4.5156531" />
+      <text
+         id="text2461-6-7-4-5-0-8"
+         y="562.5957"
+         x="1399.2255"
+         style="font-size:10.90068817px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         xml:space="preserve"
+         sodipodi:linespacing="125%"><tspan
+           id="tspan2463-3-5-2-7-1-9"
+           y="562.5957"
+           x="1399.2255"
+           sodipodi:role="line">main.restart()</tspan></text>
+    </g>
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:12.8904295px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="748.91864"
+       y="655.28705"
+       id="text2467-1-5-4-7-3-64-9-9-6"><tspan
+         sodipodi:role="line"
+         id="tspan2469-4-3-8-9-0-4-4-7-4"
+         x="748.91864"
+         y="655.28705"
+         style="font-size:8.20300102px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">SYS_UNKNOWN_ERROR</tspan></text>
+    <g
+       style="display:inline"
+       id="g8763-8-3"
+       transform="matrix(0.76886496,0,0,0.76886496,398.58213,145.34928)">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="rect8502-1-3-1-3-5-0"
+         d="m 687.97895,686.92944 19.03124,19.03125 -18.43749,18.4375 130.95537,0 -19.03125,-19.03125 18.4375,-18.4375 -130.95537,0 z"
+         style="opacity:0.80373798;color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.33651051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="150%"
+         xml:space="preserve"
+         style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+         x="753.75067"
+         y="709.81586"
+         id="text2429-9-7-7-2-2-4-3-9-9"><tspan
+           id="tspan8676-1-9-7-2"
+           sodipodi:role="line"
+           x="753.75067"
+           y="709.81586"
+           style="font-size:11.40619183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:150%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans">ROOT_MISMATCH</tspan></text>
+    </g>
+    <path
+       style="color:#000000;fill:none;stroke:#967b71;stroke-width:1.53772998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 870.0753,642.38627 c 114.93757,-0.52564 106.17709,-0.37222 108.80523,27.83654"
+       id="path8817-5-8-1-5-2-5-5"
+       sodipodi:nodetypes="cc" />
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:9.66237164px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans Italic"
+       x="869.67584"
+       y="638.96759"
+       id="text2461-6-0-31-6-2-3-4"><tspan
+         sodipodi:role="line"
+         x="869.67584"
+         y="638.96759"
+         id="tspan2463-3-4-2-8-1-8-0">From any node</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       xml:space="preserve"
+       style="font-size:12.8904295px;font-style:italic;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Sans"
+       x="916.75098"
+       y="655.28705"
+       id="text2467-1-5-4-7-3-64-9-9-6-2"><tspan
+         sodipodi:role="line"
+         id="tspan2469-4-3-8-9-0-4-4-7-4-2"
+         x="916.75098"
+         y="655.28705"
+         style="font-size:8.20300102px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#967b71;fill-opacity:1;stroke:none;stroke-width:2;marker:none;marker-end:url(#Arrow1Mend1u64);visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono">SYS_ROOT_MISMATCH</tspan></text>
   </g>
 </svg>

=== modified file 'docs/syncdaemon_dbus_api.txt'
--- docs/syncdaemon_dbus_api.txt	2010-03-10 23:36:53 +0000
+++ docs/syncdaemon_dbus_api.txt	2010-03-31 23:55:45 +0000
@@ -48,6 +48,9 @@
       UploadFinished(path=s,info=a{ss})
          Fire a D-BUS signal, notifying an upload has finished.  
 
+      InvalidName(dirname=s,filename=ay)
+        Fire a D-BUS signal, notifying an invalid file or dir name.
+
       DownloadStarted(path=v)
          Fire a D-BUS signal, notifying a download has started.  
 
@@ -141,6 +144,9 @@
       udf_autosubscribe_enabled()
         Return the udf_autosubscribe config value.
 
+      files_sync_enabled()
+        No docstring
+
       disable_bandwidth_throttling()
         Disable bandwidth throttling.
 
@@ -154,6 +160,9 @@
       enable_bandwidth_throttling()
         Enable bandwidth throttling.
 
+      set_files_sync_enabled(enabled=b)
+        Enable UDF autosubscribe.
+
       disable_udf_autosubscribe()
         Enable UDF autosubscribe.
 

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-02-17 23:51:29 +0000
+++ nautilus/contacts-view.c	2010-03-31 23:55:45 +0000
@@ -38,6 +38,7 @@
 } SelectedContactInfo;
 
 enum {
+	SELECTION_CHANGED_SIGNAL,
 	CONTACTS_COUNT_CHANGED_SIGNAL,
 	LAST_SIGNAL
 };
@@ -85,6 +86,15 @@
 	object_class->finalize = contacts_view_finalize;
 
 	/* Signals */
+	contacts_view_signals[SELECTION_CHANGED_SIGNAL] =
+		g_signal_new ("selection-changed",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (ContactsViewClass, selection_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
 	contacts_view_signals[CONTACTS_COUNT_CHANGED_SIGNAL] =
 		g_signal_new ("contacts-count-changed",
 			      G_OBJECT_CLASS_TYPE (object_class),
@@ -115,38 +125,33 @@
 }
 
 static void
-item_activated_cb (GtkIconView *icon_view, GtkTreePath *path, gpointer data)
+selection_changed_cb (GtkIconView *icon_view, gpointer data)
 {
-	GtkTreeIter iter;
 	GtkTreeModel *model;
+	GList *selected_items, *l;
 	ContactsView *cv = CONTACTS_VIEW (data);
 
+	g_debug ("Selection_changed called");
+
+	/* We first remove all the previous selected items */
+	g_hash_table_remove_all (cv->selection);
+
+	/* Now add the new selection */
 	model = gtk_icon_view_get_model (icon_view);
-	if (gtk_tree_model_get_iter (model, &iter, path)) {
-		gchar *name, *email;
-		GdkPixbuf *icon;
-
-		gtk_tree_model_get (model, &iter,
-				    CONTACTS_VIEW_COLUMN_NAME, &name,
-				    CONTACTS_VIEW_COLUMN_EMAIL, &email,
-				    CONTACTS_VIEW_COLUMN_PIXBUF, &icon,
-				    -1);
-
-		/* if already selected, deselect it */
-		if (g_hash_table_lookup (cv->selection, name)) {
-			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-					    CONTACTS_VIEW_COLUMN_MARKUP, name,
-					    -1);
-			g_hash_table_remove (cv->selection, name);
-		} else {
-			gchar *markup;
+	selected_items = gtk_icon_view_get_selected_items (icon_view);
+	for (l = selected_items; l != NULL; l = l->next) {
+		GtkTreeIter iter;
+
+		if (gtk_tree_model_get_iter (model, &iter, (GtkTreePath *) l->data)) {
+			gchar *name, *email;
+			GdkPixbuf *icon;
 			SelectedContactInfo *sci;
 
-			markup = g_strdup_printf ("<b><big>%s</big></b>", name);
-			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-					    CONTACTS_VIEW_COLUMN_MARKUP, markup,
+			gtk_tree_model_get (model, &iter,
+					    CONTACTS_VIEW_COLUMN_NAME, &name,
+					    CONTACTS_VIEW_COLUMN_EMAIL, &email,
+					    CONTACTS_VIEW_COLUMN_PIXBUF, &icon,
 					    -1);
-			g_free (markup);
 
 			sci = g_new0 (SelectedContactInfo, 1);
 			sci->name = g_strdup (name);
@@ -159,6 +164,12 @@
 			save_recently_used_list (cv);
 		}
 	}
+
+	/* Free memory */
+	g_list_foreach (selected_items, (GFunc) gtk_tree_path_free, NULL);
+	g_list_free (selected_items);
+
+	g_signal_emit_by_name (cv, "selection-changed", NULL);
 }
 
 static void
@@ -258,7 +269,7 @@
 }
 
 static void
-add_contacts (ContactsView *cv, GList *contacts)
+add_contacts (ContactsView *cv, GList *contacts, GHashTable *selection_hash)
 {
 	GList *l;
 
@@ -266,7 +277,7 @@
 		EContact *contact = l->data;
 
 		/* We add the selected items when searching, so ignore them here */
-		if (g_hash_table_lookup (cv->selection, (gconstpointer) e_contact_get_const (contact, E_CONTACT_FULL_NAME)))
+		if (g_hash_table_lookup (selection_hash, (gconstpointer) e_contact_get_const (contact, E_CONTACT_FULL_NAME)))
 			continue;
 
 		add_one_contact (cv,
@@ -290,15 +301,19 @@
 
 	if (status != E_BOOK_ERROR_OK) {
 		g_warning ("Error opening addressbook: %d", status);
+		g_object_unref (G_OBJECT (book));
 		return;
 	}
 
+	/* Add the book to the list of opened books */
+	cv->books = g_slist_append (cv->books, book);
+
 	/* Get all contacts for this book */
 	query = e_book_query_any_field_contains ("");
 	e_book_get_contacts (book, query, &contacts, NULL);
 	e_book_query_unref (query);
 
-	add_contacts (cv, contacts);
+	add_contacts (cv, contacts, cv->selection);
 	
 }
 
@@ -352,8 +367,8 @@
 	gtk_widget_show (scroll);
 
 	cv->recently_used_view = gtk_icon_view_new ();
-	g_signal_connect (G_OBJECT (cv->recently_used_view), "item-activated",
-			  G_CALLBACK (item_activated_cb), cv);
+	g_signal_connect (G_OBJECT (cv->recently_used_view), "selection-changed",
+			  G_CALLBACK (selection_changed_cb), cv);
 	gtk_icon_view_set_text_column (GTK_ICON_VIEW (cv->recently_used_view), CONTACTS_VIEW_COLUMN_NAME);
 	gtk_icon_view_set_markup_column (GTK_ICON_VIEW (cv->recently_used_view), CONTACTS_VIEW_COLUMN_MARKUP);
 	gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (cv->recently_used_view), CONTACTS_VIEW_COLUMN_PIXBUF);
@@ -374,8 +389,8 @@
 	gtk_widget_show (scroll);
 
 	cv->alphabetical_view = gtk_icon_view_new ();
-	g_signal_connect (G_OBJECT (cv->alphabetical_view), "item-activated",
-			  G_CALLBACK (item_activated_cb), cv);
+	g_signal_connect (G_OBJECT (cv->alphabetical_view), "selection-changed",
+			  G_CALLBACK (selection_changed_cb), cv);
 	gtk_icon_view_set_text_column (GTK_ICON_VIEW (cv->alphabetical_view), CONTACTS_VIEW_COLUMN_NAME);
 	gtk_icon_view_set_markup_column (GTK_ICON_VIEW (cv->alphabetical_view), CONTACTS_VIEW_COLUMN_MARKUP);
 	gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (cv->alphabetical_view), CONTACTS_VIEW_COLUMN_PIXBUF);
@@ -410,7 +425,6 @@
 			book = e_book_new ((ESource *) sl->data, &error);
 			if (book != NULL) {
 				e_book_async_open (book, TRUE, (EBookCallback) book_opened_cb, cv);
-				cv->books = g_slist_append (cv->books, book);
 			} else {
 				g_warning ("Could not open addressbook %s: %s", e_source_get_uri (sl->data), error->message);
 				g_error_free (error);
@@ -426,39 +440,57 @@
 }
 
 static void
-append_selected_to_model (GtkListStore *model, SelectedContactInfo *sli)
+append_selected_to_model (GtkIconView *icon_view, SelectedContactInfo *sci)
 {
-	gchar *markup;
 	GtkTreeIter new_row;
-
-	markup = g_strdup_printf ("<b><big>%s</big></b>", (const gchar *) sli->name);
+	GtkListStore *model = GTK_LIST_STORE (gtk_icon_view_get_model (icon_view));
 
 	gtk_list_store_prepend (model, &new_row);
 	gtk_list_store_set (GTK_LIST_STORE (model), &new_row,
-			    CONTACTS_VIEW_COLUMN_NAME, sli->name,
-			    CONTACTS_VIEW_COLUMN_MARKUP, markup,
-			    CONTACTS_VIEW_COLUMN_EMAIL, sli->email,
-			    CONTACTS_VIEW_COLUMN_PIXBUF, sli->pixbuf,
+			    CONTACTS_VIEW_COLUMN_NAME, sci->name,
+			    CONTACTS_VIEW_COLUMN_MARKUP, sci->name,
+			    CONTACTS_VIEW_COLUMN_EMAIL, sci->email,
+			    CONTACTS_VIEW_COLUMN_PIXBUF, sci->pixbuf,
 			    -1);
 
-	g_free (markup);
+	gtk_icon_view_select_path (icon_view,
+				   gtk_tree_model_get_path (GTK_TREE_MODEL (model), &new_row));
 }
 
 static void
 foreach_selected_to_model_cb (gpointer key, gpointer value, gpointer user_data)
 {
-	GtkListStore *model;
-	SelectedContactInfo *sli = (SelectedContactInfo *) value;
+	SelectedContactInfo *sci = (SelectedContactInfo *) value;
 	ContactsView *cv = CONTACTS_VIEW (user_data);
 
-	append_selected_to_model (GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->recently_used_view))), sli);
-	append_selected_to_model (GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->alphabetical_view))), sli);
+	append_selected_to_model (GTK_ICON_VIEW (cv->recently_used_view), sci);
+	append_selected_to_model (GTK_ICON_VIEW (cv->alphabetical_view), sci);
 }
 
 void
 contacts_view_search (ContactsView *cv, const gchar *search_string)
 {
 	GSList *l;
+	GHashTable *tmp_selection;
+	GHashTableIter hash_iter;
+	gpointer key, value;
+
+	/* Make a copy of the selected items before changing the models */
+	tmp_selection = g_hash_table_new_full (g_str_hash, g_str_equal,
+					       (GDestroyNotify) g_free,
+					       (GDestroyNotify) free_selected_contact_info);
+	g_hash_table_iter_init (&hash_iter, cv->selection);
+	while (g_hash_table_iter_next (&hash_iter, &key, &value)) {
+		SelectedContactInfo *new_sci, *old_sci;
+
+		old_sci = (SelectedContactInfo *) value;
+
+		new_sci = g_new0 (SelectedContactInfo, 1);
+		new_sci->name = g_strdup (old_sci->name);
+		new_sci->email = g_strdup (old_sci->email);
+		new_sci->pixbuf = gdk_pixbuf_ref (old_sci->pixbuf);
+		g_hash_table_insert (tmp_selection, g_strdup (old_sci->name), new_sci);
+	}
 
 	/* Reset the icon views */
 	gtk_list_store_clear (GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->recently_used_view))));
@@ -481,11 +513,12 @@
 		e_book_get_contacts (book, query, &contacts, NULL);
 		e_book_query_unref (query);
 
-		add_contacts (cv, contacts);
+		add_contacts (cv, contacts, tmp_selection);
 	}
 
 	/* Now add selected contacts */
-	g_hash_table_foreach (cv->selection, (GHFunc) foreach_selected_to_model_cb, cv);
+	g_hash_table_foreach (tmp_selection, (GHFunc) foreach_selected_to_model_cb, cv);
+	g_hash_table_destroy (tmp_selection);
 }
 
 static void
@@ -505,3 +538,59 @@
 	g_hash_table_foreach (cv->selection, (GHFunc) add_selection_to_list_cb, &selection);
 	return selection;
 }
+
+guint
+contacts_view_get_contacts_count (ContactsView *cv)
+{
+	return gtk_tree_model_iter_n_children (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->alphabetical_view)),
+					       NULL);
+}
+
+void
+contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email)
+{
+	SelectedContactInfo *sci;
+	GtkIconTheme *icon_theme;
+	GSList *l;
+
+	icon_theme = gtk_icon_theme_get_default ();
+
+	/* First add the new contact to the list of selected ones */
+	sci = g_new0 (SelectedContactInfo, 1);
+	sci->name = g_strdup (contact_name);
+	sci->email = g_strdup (contact_email);
+	sci->pixbuf = gtk_icon_theme_load_icon (icon_theme, GTK_STOCK_ORIENTATION_PORTRAIT, 64, 0, NULL);
+	g_hash_table_insert (cv->selection, g_strdup (contact_name), sci);
+
+	/* Add it to the recently used list */
+	g_hash_table_insert (cv->recently_used, g_strdup (sci->name), sci->name);
+	save_recently_used_list (cv);
+
+	/* And now add it to the icon views */
+	append_selected_to_model (GTK_ICON_VIEW (cv->recently_used_view), sci);
+	append_selected_to_model (GTK_ICON_VIEW (cv->alphabetical_view), sci);
+
+	/* Add the contact to the CouchDB addressbook, if possible */
+	for (l = cv->books; l != NULL; l = l->next) {
+		const gchar *uri;
+
+		uri = e_book_get_uri (E_BOOK (l->data));
+		if (g_str_has_prefix (uri, "couchdb://127.0.0.1")) {
+			EContact *contact;
+			GError *error = NULL;
+
+			contact = e_contact_new ();
+			e_contact_set (contact, E_CONTACT_FULL_NAME, (gconstpointer) contact_name);
+			e_contact_set (contact, E_CONTACT_EMAIL_1, (gconstpointer) contact_email);
+
+			if (!e_book_add_contact (E_BOOK (l->data), contact, &error)) {
+				g_warning ("Could not add contact to %s: %s", uri, error->message);
+				g_error_free (error);
+			}
+
+			g_object_unref (G_OBJECT (contact));
+
+			break;
+		}
+	}
+}

=== modified file 'nautilus/contacts-view.h'
--- nautilus/contacts-view.h	2010-02-17 23:51:29 +0000
+++ nautilus/contacts-view.h	2010-03-31 23:55:45 +0000
@@ -54,6 +54,7 @@
 	GtkNotebookClass parent_class;
 
 	/* Signals */
+	void (* selection_changed) (ContactsView *cv);
 	void (* contacts_count_changed) (ContactsView *cv, gint total);
 } ContactsViewClass;
 
@@ -62,5 +63,7 @@
 GtkWidget *contacts_view_new (void);
 void       contacts_view_search (ContactsView *cv, const gchar *search_string);
 GSList    *contacts_view_get_selected_emails (ContactsView *cv);
+guint      contacts_view_get_contacts_count (ContactsView *cv);
+void       contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email);
 
 #endif

=== modified file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2010-02-17 23:51:29 +0000
+++ nautilus/u1-contacts-picker.c	2010-03-31 23:55:45 +0000
@@ -27,7 +27,17 @@
 	GtkWidget *search_entry;
 	GtkWidget *total_label;
 	GtkWidget *contacts_view;
-};
+
+	/* Hidden widgets to add a new contact */
+	GtkWidget *add_contact_button;
+};
+
+enum {
+	SELECTION_CHANGED_SIGNAL,
+	LAST_SIGNAL
+};
+
+static guint u1_contacts_picker_signals[LAST_SIGNAL] = { 0, };
 
 G_DEFINE_TYPE(U1ContactsPicker, u1_contacts_picker, GTK_TYPE_VBOX)
 
@@ -50,14 +60,42 @@
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize = u1_contacts_picker_finalize;
+
+	/* Register object signals */
+	u1_contacts_picker_signals[SELECTION_CHANGED_SIGNAL] =
+		g_signal_new ("selection-changed",
+			      G_TYPE_FROM_CLASS (klass),
+			      (GSignalFlags) G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (U1ContactsPickerClass, selection_changed),
+			      NULL,
+			      NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
 }
 
 static void
-search_activated_cb (GtkEntry *entry, gpointer data)
+search_activated_cb (GtkEditable *entry, gpointer data)
 {
+	const gchar *text;
 	U1ContactsPicker *picker = (U1ContactsPicker *) data;
 
-	contacts_view_search (CONTACTS_VIEW (picker->priv->contacts_view), gtk_entry_get_text (entry));
+	text = gtk_entry_get_text (GTK_ENTRY (entry));
+	contacts_view_search (CONTACTS_VIEW (picker->priv->contacts_view), text);
+
+	/* If no contacts offer the user to add it to the contacts database */
+	if (contacts_view_get_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0)
+		gtk_widget_show (picker->priv->add_contact_button);
+	else
+		gtk_widget_hide (picker->priv->add_contact_button);
+}
+
+static void
+view_selection_changed_cb (ContactsView *cv, gpointer user_data)
+{
+	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
+
+	g_signal_emit (picker, u1_contacts_picker_signals[SELECTION_CHANGED_SIGNAL], 0);
 }
 
 static void
@@ -66,41 +104,102 @@
 	gchar *label;
 	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
 
-	label = g_strdup_printf (ngettext ("%d contact", "%d contacts", total), total);
+	if (strlen (gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry))) > 0)
+		label = g_strdup_printf (ngettext ("Found %d match", "Found %d matches", total), total);
+	else
+		label = g_strdup_printf (ngettext ("%d contact", "%d contacts", total), total);
 	gtk_label_set_text (GTK_LABEL (picker->priv->total_label), label);
 
 	g_free (label);
 }
 
 static void
+add_contact_cb (GtkButton *button, gpointer user_data)
+{
+	GtkWidget *dialog, *table, *label, *name_entry, *email_entry;
+	const gchar *search_text;
+	U1ContactsPicker *picker = (U1ContactsPicker *) user_data;
+
+	/* Build the dialog */
+	dialog = gtk_dialog_new_with_buttons (_("Add contact"),
+					      GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (picker))),
+					      GTK_DIALOG_NO_SEPARATOR,
+					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					      GTK_STOCK_ADD, GTK_RESPONSE_OK,
+					      NULL);
+	table = gtk_table_new (2, 2, FALSE);
+	gtk_widget_show (table);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+			    table, TRUE, TRUE, 3);
+
+	label = gtk_label_new (_("Contact name"));
+	gtk_widget_show (label);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+	name_entry = gtk_entry_new ();
+	gtk_widget_show (name_entry);
+	gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+
+	label = gtk_label_new (_("Email address"));
+	gtk_widget_show (label);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
+	email_entry = gtk_entry_new ();
+	gtk_widget_show (email_entry);
+	gtk_table_attach (GTK_TABLE (table), email_entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
+
+	search_text = gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry));
+	if (g_strrstr (search_text, "@") != NULL)
+		gtk_entry_set_text (GTK_ENTRY (email_entry), search_text);
+	else
+		gtk_entry_set_text (GTK_ENTRY (name_entry), search_text);
+
+	/* Run the dialog */
+	gtk_widget_grab_focus (name_entry);
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
+		contacts_view_add_contact (CONTACTS_VIEW (picker->priv->contacts_view),
+					   gtk_entry_get_text (GTK_ENTRY (name_entry)),
+					   gtk_entry_get_text (GTK_ENTRY (email_entry)));
+		gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), "");
+	}
+
+	gtk_widget_destroy (dialog);
+	gtk_widget_hide (picker->priv->add_contact_button);
+}
+
+static void
 u1_contacts_picker_init (U1ContactsPicker *picker)
 {
-	GtkWidget *table, *scroll;
-	GtkTreeModel *model;
+	GtkWidget *table;
 
 	picker->priv = g_new0 (U1ContactsPickerPrivate, 1);
 
 	/* Create the table to contain the layout */
-	table = gtk_table_new (3, 2, FALSE);
+	table = gtk_table_new (4, 3, FALSE);
 	gtk_widget_show (table);
 	gtk_box_pack_start (GTK_BOX (picker), table, TRUE, TRUE, 3);
 
 	/* Create the search area */
 	picker->priv->search_entry = gtk_entry_new ();
-	g_signal_connect (G_OBJECT (picker->priv->search_entry), "activate", G_CALLBACK (search_activated_cb), picker);
+	g_signal_connect (G_OBJECT (picker->priv->search_entry), "changed", G_CALLBACK (search_activated_cb), picker);
 	gtk_widget_show (picker->priv->search_entry);
 	gtk_table_attach (GTK_TABLE (table), picker->priv->search_entry, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
 
-	picker->priv->total_label = gtk_label_new (ngettext ("%d contact", "%d contacts", 0));
+	picker->priv->add_contact_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
+	g_signal_connect (G_OBJECT (picker->priv->add_contact_button), "clicked",
+			  G_CALLBACK (add_contact_cb), picker);
+	gtk_table_attach (GTK_TABLE (table), picker->priv->add_contact_button, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+
+	picker->priv->total_label = gtk_label_new (ngettext ("0 contact", "0 contacts", 0));
 	gtk_widget_show (picker->priv->total_label);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->total_label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-	
+	gtk_table_attach (GTK_TABLE (table), picker->priv->total_label, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+
 	/* Create the contacts view */
 	picker->priv->contacts_view = contacts_view_new ();
+	g_signal_connect (G_OBJECT (picker->priv->contacts_view), "selection-changed",
+			  G_CALLBACK (view_selection_changed_cb), picker);
 	g_signal_connect (G_OBJECT (picker->priv->contacts_view), "contacts-count-changed",
 			  G_CALLBACK (contacts_count_changed_cb), picker);
 	gtk_widget_show (picker->priv->contacts_view);
-	gtk_table_attach (GTK_TABLE (table), picker->priv->contacts_view, 0, 2, 1, 3,
+	gtk_table_attach (GTK_TABLE (table), picker->priv->contacts_view, 0, 3, 2, 4,
 			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
 			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
 			  3, 3);

=== modified file 'nautilus/u1-contacts-picker.h'
--- nautilus/u1-contacts-picker.h	2010-02-17 23:51:29 +0000
+++ nautilus/u1-contacts-picker.h	2010-03-31 23:55:45 +0000
@@ -44,6 +44,9 @@
 
 struct _U1ContactsPickerClass {
 	GtkVBoxClass parent_class;
+
+	/* Signals */
+	void (* selection_changed) (U1ContactsPicker *picker);
 };
 
 GType      u1_contacts_picker_get_type (void);

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-03-10 23:36:53 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-03-31 23:55:45 +0000
@@ -328,7 +328,7 @@
 							  const char * uri,
 							  GtkWidget * parent) {
   UbuntuOneNautilus * uon;
-  gchar * path, * upath;
+  gchar * path;
   GtkWidget * hbox = NULL;
   GtkWidget * label;
   gchar * labeltext;
@@ -402,6 +402,20 @@
   data = NULL;
 }
 
+static void
+picker_selection_changed_cb (U1ContactsPicker *picker, gpointer user_data)
+{
+  GSList *selection;
+  GtkWidget * dialog = (GtkWidget *) user_data;
+
+  selection = u1_contacts_picker_get_selected_emails (picker);
+  if (selection != NULL) {
+    gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, TRUE);
+    u1_contacts_picker_free_selection_list (selection);
+  } else
+    gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
+}
+
 /* Share on Ubuntu One dialog constructor */
 static GtkWidget * ubuntuone_nautilus_share_dialog_construct (struct _CBData * data) {
   GtkWidget * dialog;
@@ -414,10 +428,11 @@
   gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 			  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			  ("Share"), GTK_RESPONSE_ACCEPT,
+			  (_("Share")), GTK_RESPONSE_ACCEPT,
 			  NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 				   GTK_RESPONSE_ACCEPT);
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
   gtk_window_set_icon_name (GTK_WINDOW (dialog), "ubuntuone");
 
   area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
@@ -436,6 +451,8 @@
   gtk_widget_show (label);
 
   data->user_picker = u1_contacts_picker_new ();
+  g_signal_connect (G_OBJECT (data->user_picker), "selection-changed",
+		    G_CALLBACK (picker_selection_changed_cb), dialog);
   gtk_table_attach (GTK_TABLE (table), data->user_picker, 0, 2, 1, 2,
 		    GTK_FILL | GTK_EXPAND | GTK_SHRINK,
 		    GTK_FILL | GTK_EXPAND | GTK_SHRINK, 3, 3);

=== modified file 'tests/__init__.pyc'
Binary files tests/__init__.pyc	2010-03-10 23:36:53 +0000 and tests/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/oauthdesktop/__init__.pyc'
Binary files tests/oauthdesktop/__init__.pyc	2010-03-10 23:36:53 +0000 and tests/oauthdesktop/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/oauthdesktop/test_auth.pyc'
Binary files tests/oauthdesktop/test_auth.pyc	2010-03-10 23:36:53 +0000 and tests/oauthdesktop/test_auth.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/oauthdesktop/test_config.pyc'
Binary files tests/oauthdesktop/test_config.pyc	2010-03-10 23:36:53 +0000 and tests/oauthdesktop/test_config.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/oauthdesktop/test_key_acls.pyc'
Binary files tests/oauthdesktop/test_key_acls.pyc	2010-03-10 23:36:53 +0000 and tests/oauthdesktop/test_key_acls.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/oauthdesktop/test_main.pyc'
Binary files tests/oauthdesktop/test_main.pyc	2010-03-10 23:36:53 +0000 and tests/oauthdesktop/test_main.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/__init__.pyc'
Binary files tests/syncdaemon/__init__.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/fsm/__init__.pyc'
Binary files tests/syncdaemon/fsm/__init__.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/fsm/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_fsm.pyc'
Binary files tests/syncdaemon/fsm/test_fsm.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/fsm/test_fsm.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_fsm_run.pyc'
Binary files tests/syncdaemon/fsm/test_fsm_run.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/fsm/test_fsm_run.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/fsm/test_run_hello.pyc'
Binary files tests/syncdaemon/fsm/test_run_hello.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/fsm/test_run_hello.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_action_predicates.pyc'
Binary files tests/syncdaemon/test_action_predicates.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_action_predicates.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2010-03-10 23:36:53 +0000
+++ tests/syncdaemon/test_action_queue.py	2010-03-31 23:55:45 +0000
@@ -47,7 +47,7 @@
 from ubuntuone.syncdaemon.action_queue import (
     ActionQueue, ActionQueueCommand, ChangePublicAccess, CreateUDF,
     DeleteVolume, ListDir, ListVolumes, NoisyRequestQueue, RequestQueue,
-    Upload
+    Upload, CreateShare,
 )
 from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
 from ubuntuone.syncdaemon.volume_manager import UDF
@@ -1183,6 +1183,65 @@
         self.assertEquals(events, self.command.action_queue.event_queue.events)
 
 
+class CreateShareTestCase(ConnectedBaseTestCase):
+    """Test for CreateShare ActionQueueCommand."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Init."""
+        yield super(CreateShareTestCase, self).setUp()
+        self.request_queue = RequestQueue(name='foo', action_queue=self.action_queue)
+        self.orig_create_share_http = CreateShare._create_share_http
+
+    @defer.inlineCallbacks
+    def tearDown(self):
+        yield super(CreateShareTestCase, self).tearDown()
+        CreateShare._create_share_http = self.orig_create_share_http
+
+    @defer.inlineCallbacks
+    def test_access_level_modify_http(self):
+        """Test proper handling of the access level in the http case."""
+        # replace _create_share_http with a fake, just to check the args
+        d = defer.Deferred()
+        def check_create_http(self, node_id, user, name, read_only, deferred):
+            """Fire the deferred with the args."""
+            d.callback((node_id, user, name, read_only))
+            deferred.callback(None)
+        CreateShare._create_share_http = check_create_http
+        command = CreateShare(self.request_queue, 'node_id',
+                                   '[e-mail]', 'share_name',
+                                   'Modify', 'marker')
+        self.assertTrue(command.use_http, 'CreateShare should be in http mode')
+
+        command._run()
+        node_id, user, name, read_only = yield d
+        self.assertEquals('node_id', node_id)
+        self.assertEquals('[e-mail]', user)
+        self.assertEquals('share_name', name)
+        self.assertFalse(read_only)
+
+    @defer.inlineCallbacks
+    def test_access_level_view_http(self):
+        """Test proper handling of the access level in the http case."""
+        # replace _create_share_http with a fake, just to check the args
+        d = defer.Deferred()
+        def check_create_http(self, node_id, user, name, read_only, deferred):
+            """Fire the deferred with the args."""
+            d.callback((node_id, user, name, read_only))
+            deferred.callback(None)
+        CreateShare._create_share_http = check_create_http
+        command = CreateShare(self.request_queue, 'node_id',
+                                   '[e-mail]', 'share_name',
+                                   'View', 'marker')
+        self.assertTrue(command.use_http, 'CreateShare should be in http mode')
+        command._run()
+        node_id, user, name, read_only = yield d
+        self.assertEquals('node_id', node_id)
+        self.assertEquals('[e-mail]', user)
+        self.assertEquals('share_name', name)
+        self.assertTrue(read_only)
+
+
 class RequestQueueManager(FactoryBaseTestCase):
     """Test how RequestQueue manages the queues."""
 

=== modified file 'tests/syncdaemon/test_action_queue.pyc'
Binary files tests/syncdaemon/test_action_queue.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_action_queue.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_config.py	2010-03-31 23:55:45 +0000
@@ -395,6 +395,21 @@
         conf.read(config.get_user_config().config_file)
         self.assertEquals(conf.get(config.THROTTLING, 'on'), 'False')
 
+    def test_files_sync_enabled(self):
+        """Test for toggling files sync."""
+        dbus_config = self.main.dbus_iface.config
+        enabled = dbus_config.files_sync_enabled()
+        self.assertTrue(enabled)
+        dbus_config.set_files_sync_enabled(False)
+        enabled = dbus_config.files_sync_enabled()
+        self.assertFalse(enabled)
+        dbus_config.set_files_sync_enabled(True)
+        enabled = dbus_config.files_sync_enabled()
+        self.assertTrue(enabled)
+        conf = ConfigParser()
+        conf.read(config.get_user_config().config_file)
+        self.assertEquals(conf.get(config.MAIN, 'files_sync_enabled'), 'True')
+
 
 class SyncDaemonConfigParserTests(BaseTwistedTestCase):
     """Tests for SyncDaemonConfigParser"""
@@ -474,3 +489,27 @@
         self.assertRaises(ValueError, self.cp.add_upgrade_hook, 'foo', 'bar',
                           lambda x: None)
 
+    def test_ignore_one(self):
+        """Test ignore files config, one regex."""
+        conf_file = os.path.join(self.test_root, 'test_new_config.conf')
+        with open(conf_file, 'w') as fp:
+            fp.write('[__main__]\n')
+            fp.write('ignore = .*\\.pyc\n')  # all .pyc files
+        self.assertTrue(os.path.exists(conf_file))
+        self.cp.read([conf_file])
+        self.cp.parse_all()
+        self.assertEquals(self.cp.get('__main__', 'ignore').value,
+                          [r'.*\.pyc'])
+
+    def test_ignore_two(self):
+        """Test ignore files config, two regexes."""
+        conf_file = os.path.join(self.test_root, 'test_new_config.conf')
+        with open(conf_file, 'w') as fp:
+            fp.write('[__main__]\n')
+            fp.write('ignore = .*\\.pyc\n')  # all .pyc files
+            fp.write('         .*\\.sw[opnx]\n')  # all gvim temp files
+        self.assertTrue(os.path.exists(conf_file))
+        self.cp.read([conf_file])
+        self.cp.parse_all()
+        self.assertEquals(self.cp.get('__main__', 'ignore').value,
+                          ['.*\\.pyc', '.*\\.sw[opnx]'])

=== modified file 'tests/syncdaemon/test_config.pyc'
Binary files tests/syncdaemon/test_config.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_config.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py	2010-03-10 23:36:53 +0000
+++ tests/syncdaemon/test_dbus.py	2010-03-31 23:55:45 +0000
@@ -1133,6 +1133,23 @@
             self.event_q.push(event_name, *args)
         return d
 
+    def test_invalid_filename(self):
+        """Test the FS_INVALID_NAME signal."""
+        d = defer.Deferred()
+
+        def handler(dirname, filename):
+            """Handler for InvalidName signal."""
+            self.assertTrue(isinstance(dirname, unicode))
+            self.assertTrue(isinstance(filename, str))
+            d.callback(True)
+
+        match = self.bus.add_signal_receiver(handler,
+                                             signal_name='InvalidName',
+                                             byte_arrays=True)
+        self.signal_receivers.add(match)
+        self.main.event_q.push('FS_INVALID_NAME', u'test/dir', 'testpath')
+        return d
+
     def test_share_changed(self):
         """ Test the ShareChanged signal. """
         share_path = os.path.join(self.main.shares_dir, 'share')

=== modified file 'tests/syncdaemon/test_dbus.pyc'
Binary files tests/syncdaemon/test_dbus.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_dbus.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2010-03-31 23:55:45 +0000
@@ -31,6 +31,18 @@
 from tests.syncdaemon.test_eventqueue import BaseEQTestCase
 
 
+class DontHitMe(object):
+    """We shouldn't be called."""
+
+    def __init__(self, test_instance):
+        self.test_instance = test_instance
+
+    def handle_default(self, *a, **k):
+        """Something here? Error!"""
+        self.test_inst.finished_error("Don't hit me! Received %s %s" % (a, k))
+
+
+
 class WatchTests(BaseEQTestCase):
     """Test the EQ API to add and remove watchs."""
 
@@ -393,20 +405,13 @@
         open(fromfile, "w").close()
         symlpath = os.path.join(testdir, "syml")
 
-        class DontHitMe(object):
-            """we shouldn't be called"""
-            # class-closure, cannot use self, pylint: disable-msg=E0213
-            def handle_default(innerself, *a):
-                """Something here? Error!"""
-                self.finished_error("don't hit me! received %s" % (a,))
-
         def confirm():
             """check result."""
             self.finished_ok()
 
         # set up everything and freeze
         self.eq.inotify_add_watch(testdir)
-        self.eq.subscribe(DontHitMe())
+        self.eq.subscribe(DontHitMe(self))
 
         os.symlink(fromfile, symlpath)
         reactor.callLater(.1, confirm)
@@ -1026,13 +1031,6 @@
         testfile = os.path.join(testdir, "bar")
         os.mkdir(testdir)
 
-        class DontHitMe(object):
-            """we shouldn't be called"""
-            # class-closure, cannot use self, pylint: disable-msg=E0213
-            def handle_default(innerself, *a):
-                """Something here? Error!"""
-                self.finished_error("don't hit me! received %s" % (a,))
-
         def freeze_commit():
             """release and check result."""
             d = self.eq.freeze_commit([("FS_DIR_DELETE", "foobar")])
@@ -1046,7 +1044,7 @@
 
         # set up everything and freeze
         self.eq.inotify_add_watch(testdir)
-        self.eq.subscribe(DontHitMe())
+        self.eq.subscribe(DontHitMe(self))
         self.eq.freeze_begin(testdir)
 
         open(testfile, "w").close()
@@ -1132,19 +1130,36 @@
 class MutedSignalsTests(BaseTwisted):
     """Test that EQ filter some signals on demand."""
 
-    class DontHitMe(object):
-        """we shouldn't be called"""
-        # class-closure, cannot use self, pylint: disable-msg=E0213
-        def __init__(innerself, obj):
-            innerself.obj = obj
-        def handle_default(innerself, *a):
-            """Something here? Error!"""
-            innerself.obj.finished_error("don't hit me! received %s" % (a,))
-
     def check_filter(self, _=None):
         self.assertFalse(self.eq._processor._to_mute._cnt)
         self.finished_ok()
 
+    def test_mute_and_remove(self):
+        """Test add and remove the mute."""
+        # add
+        self.eq.add_to_mute_filter('FS_FILE_OPEN', 'somepath')
+        self.assertEqual(self.eq._processor._to_mute._cnt,
+                         {('FS_FILE_OPEN', 'somepath'): 1})
+        self.eq.add_to_mute_filter('FS_FILE_OPEN', 'somepath')
+        self.assertEqual(self.eq._processor._to_mute._cnt,
+                         {('FS_FILE_OPEN', 'somepath'): 2})
+        self.eq.add_to_mute_filter('FS_FILE_OPEN', 'otherpath')
+        self.assertEqual(self.eq._processor._to_mute._cnt,
+                         {('FS_FILE_OPEN', 'somepath'): 2,
+                          ('FS_FILE_OPEN', 'otherpath'): 1})
+
+        # remove
+        self.eq.rm_from_mute_filter('FS_FILE_OPEN', 'somepath')
+        self.assertEqual(self.eq._processor._to_mute._cnt,
+                         {('FS_FILE_OPEN', 'somepath'): 1,
+                          ('FS_FILE_OPEN', 'otherpath'): 1})
+        self.eq.rm_from_mute_filter('FS_FILE_OPEN', 'otherpath')
+        self.assertEqual(self.eq._processor._to_mute._cnt,
+                         {('FS_FILE_OPEN', 'somepath'): 1})
+        self.eq.rm_from_mute_filter('FS_FILE_OPEN', 'somepath')
+        self.assertEqual(self.eq._processor._to_mute._cnt, {})
+
+
     def test_file_open(self):
         """Test receiving the open signal on files."""
         testfile = os.path.join(self.root_dir, "foo")
@@ -1153,7 +1168,7 @@
         self.eq.add_to_mute_filter("FS_FILE_CLOSE_NOWRITE", testfile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         open(testfile)
@@ -1168,7 +1183,7 @@
         self.eq.add_to_mute_filter("FS_FILE_CLOSE_NOWRITE", testfile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         fh.close()
@@ -1183,7 +1198,7 @@
         self.eq.add_to_mute_filter("FS_FILE_CLOSE_WRITE", testfile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         open(testfile, "w").close()
@@ -1196,7 +1211,7 @@
         self.eq.add_to_mute_filter("FS_DIR_CREATE", testdir)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.mkdir(testdir)
@@ -1210,7 +1225,7 @@
         self.eq.add_to_mute_filter("FS_FILE_DELETE", testfile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.remove(testfile)
@@ -1224,7 +1239,7 @@
         self.eq.add_to_mute_filter("FS_DIR_DELETE", testdir)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.rmdir(testdir)
@@ -1243,7 +1258,7 @@
         self.eq.add_to_mute_filter("FS_FILE_MOVE", fromfile, tofile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.rename(fromfile, tofile)
@@ -1262,7 +1277,7 @@
         self.eq.add_to_mute_filter("FS_DIR_MOVE", fromdir, todir)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.rename(fromdir, todir)
@@ -1281,7 +1296,7 @@
         self.eq.add_to_mute_filter("FS_FILE_MOVE", fromfile, tofile)
 
         self.eq.inotify_add_watch(self.root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.rename(fromfile, tofile)
@@ -1299,7 +1314,7 @@
         self.eq.add_to_mute_filter("FS_FILE_CLOSE_WRITE", tofile)
 
         self.eq.inotify_add_watch(root_dir)
-        self.eq.subscribe(self.DontHitMe(self))
+        self.eq.subscribe(DontHitMe(self))
 
         # generate the event
         os.rename(fromfile, tofile)
@@ -1701,6 +1716,140 @@
         return self._deferred
 
 
+class NonUTF8NamesTests(BaseTwisted):
+    """Test the non-utf8 name handling."""
+
+    invalid_name = "invalid \xff\xff name"
+
+    def test_file_open(self):
+        """Test invalid_filename after open a file."""
+        testfile = os.path.join(self.root_dir, self.invalid_name)
+        open(testfile, "w").close()
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # open
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # close no w
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        open(testfile)
+        return self._deferred
+
+    def test_file_close_nowrite(self):
+        """Test invalid_filename after a close no write."""
+        testfile = os.path.join(self.root_dir, self.invalid_name)
+        open(testfile, "w").close()
+        fh = open(testfile)
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # close no w
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        fh.close()
+        return self._deferred
+
+    def test_file_create_close_write(self):
+        """Test invalid_filename after a create, open and close write."""
+        testfile = os.path.join(self.root_dir, self.invalid_name)
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # create
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # open
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # close w
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        open(testfile, "w").close()
+        return self._deferred
+
+    def test_dir_create(self):
+        """Test invalid_filename after a dir create."""
+        testdir = os.path.join(self.root_dir, self.invalid_name)
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # create
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        os.mkdir(testdir)
+        return self._deferred
+
+    def test_file_delete(self):
+        """Test invalid_filename after a file delete."""
+        testfile = os.path.join(self.root_dir, self.invalid_name)
+        open(testfile, "w").close()
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # delete
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        os.remove(testfile)
+        return self._deferred
+
+    def test_dir_delete(self):
+        """Test invalid_filename after a dir delete."""
+        testdir = os.path.join(self.root_dir, self.invalid_name)
+        os.mkdir(testdir)
+
+        self.eq.inotify_add_watch(self.root_dir)
+        should_events = [
+            ('FS_INVALID_NAME', self.root_dir, self.invalid_name), # delete
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        os.rmdir(testdir)
+        return self._deferred
+
+    def test_file_move_to(self):
+        """Test invalid_filename after moving a file into a watched dir."""
+        fromfile = os.path.join(self.root_dir, self.invalid_name)
+        open(fromfile, "w").close()
+        destdir = os.path.join(self.root_dir, "watched_dir")
+        os.mkdir(destdir)
+        destfile = os.path.join(destdir, self.invalid_name)
+
+        self.eq.inotify_add_watch(destdir)
+        should_events = [
+            ('FS_INVALID_NAME', destdir, self.invalid_name), # move to
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        os.rename(fromfile, destfile)
+        return self._deferred
+
+    def test_file_move_from(self):
+        """Test invalid_filename after moving a file from a watched dir."""
+        fromdir = os.path.join(self.root_dir, "watched_dir")
+        os.mkdir(fromdir)
+        fromfile = os.path.join(fromdir, self.invalid_name)
+        open(fromfile, "w").close()
+        destfile = os.path.join(self.root_dir, self.invalid_name)
+
+        self.eq.inotify_add_watch(fromdir)
+        should_events = [
+            ('FS_INVALID_NAME', fromdir, self.invalid_name), # move from
+        ]
+        self.eq.subscribe(DynamicHitMe(should_events, self))
+
+        # generate the event
+        os.rename(fromfile, destfile)
+        return self._deferred
+
+
 def test_suite():
     # pylint: disable-msg=C0111
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'tests/syncdaemon/test_eq_inotify.pyc'
Binary files tests/syncdaemon/test_eq_inotify.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_eq_inotify.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_eventqueue.py'
--- tests/syncdaemon/test_eventqueue.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_eventqueue.py	2010-03-31 23:55:45 +0000
@@ -382,6 +382,42 @@
         self.assertFalse(self.mf._cnt)
 
 
+class IgnoreFileTests(unittest.TestCase):
+    """Tests the ignore files behaviour."""
+
+    def test_filter_none(self):
+        """Still works ok even if not receiving a regex to ignore."""
+        p = event_queue._GeneralINotifyProcessor(None)
+        self.assertFalse(p.is_ignored("froo.pyc"))
+
+    def test_filter_one(self):
+        """Filters stuff that matches (or not) this one regex."""
+        p = event_queue._GeneralINotifyProcessor(None, ['\A.*\\.pyc\Z'])
+        self.assertTrue(p.is_ignored("froo.pyc"))
+        self.assertFalse(p.is_ignored("froo.pyc.real"))
+        self.assertFalse(p.is_ignored("otherstuff"))
+
+    def test_filter_two_simple(self):
+        """Filters stuff that matches (or not) these simple regexes."""
+        p = event_queue._GeneralINotifyProcessor(None, ['\A.*foo\Z',
+                                                        '\A.*bar\Z'])
+        self.assertTrue(p.is_ignored("blah_foo"))
+        self.assertTrue(p.is_ignored("blah_bar"))
+        self.assertFalse(p.is_ignored("bar_xxx"))
+        self.assertFalse(p.is_ignored("--foo--"))
+        self.assertFalse(p.is_ignored("otherstuff"))
+
+    def test_filter_two_complex(self):
+        """Filters stuff that matches (or not) these complex regexes."""
+        p = event_queue._GeneralINotifyProcessor(None, ['\A.*foo\Z|\Afoo.*\Z',
+                                                        '\A.*bar\Z'])
+        self.assertTrue(p.is_ignored("blah_foo"))
+        self.assertTrue(p.is_ignored("blah_bar"))
+        self.assertTrue(p.is_ignored("foo_xxx"))
+        self.assertFalse(p.is_ignored("--foo--"))
+        self.assertFalse(p.is_ignored("otherstuff"))
+
+
 def test_suite():
     # pylint: disable-msg=C0111
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'tests/syncdaemon/test_eventqueue.pyc'
Binary files tests/syncdaemon/test_eventqueue.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_eventqueue.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_eventsnanny.pyc'
Binary files tests/syncdaemon/test_eventsnanny.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_eventsnanny.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_fileshelf.py'
--- tests/syncdaemon/test_fileshelf.py	2010-02-17 23:51:29 +0000
+++ tests/syncdaemon/test_fileshelf.py	2010-03-31 23:55:45 +0000
@@ -133,7 +133,7 @@
         self.assertTrue(('foo', 'bar') and ('foo1', 'bar1') in \
                         [(k, v) for k, v in shelf.items()])
 
-    def test_broked_metadata_without_backup(self):
+    def test_broken_metadata_without_backup(self):
         """test the shelf behavior when it hit a broken metadata file without
         backup.
         """
@@ -148,7 +148,7 @@
             f.write(BROKEN_PICKLE)
         self.assertRaises(KeyError, self.shelf.__getitem__, 'broken_pickle')
 
-    def test_broked_metadata_with_backup(self):
+    def test_broken_metadata_with_backup(self):
         """test that each time a metadata file is updated a .old is kept"""
         self.shelf['bad_file'] = {'value':'old'}
         path = self.shelf.key_file('bad_file')
@@ -254,6 +254,42 @@
         self.assertEquals(shelf.values['foo'],
                           cPickle.dumps('bar', protocol=2))
 
+    def test_broken_metadata_iteritems(self):
+        """Test that broken metadata is ignored during iteritems."""
+        self.shelf['ok_key'] = {'status':'this is valid metadata'}
+        self.shelf['bad_file'] = {}
+        path = self.shelf.key_file('bad_file')
+        open(path, 'w').close()
+        self.assertRaises(KeyError, self.shelf.__getitem__, 'bad_file')
+        self.assertEquals(1, len(list(self.shelf.iteritems())))
+        self.assertFalse(os.path.exists(path))
+
+        self.shelf['broken_pickle'] = {}
+        path = self.shelf.key_file('broken_pickle')
+        with open(path, 'w') as f:
+            f.write(BROKEN_PICKLE)
+        self.assertRaises(KeyError, self.shelf.__getitem__, 'broken_pickle')
+        self.assertEquals(1, len(list(self.shelf.iteritems())))
+        self.assertFalse(os.path.exists(path))
+
+    def test_broken_metadata_items(self):
+        """Test that broken metadata is ignored during iteritems."""
+        self.shelf['ok_key'] = {'status':'this is valid metadata'}
+        self.shelf['bad_file'] = {}
+        path = self.shelf.key_file('bad_file')
+        open(path, 'w').close()
+        self.assertRaises(KeyError, self.shelf.__getitem__, 'bad_file')
+        self.assertEquals(1, len(list(self.shelf.items())))
+        self.assertFalse(os.path.exists(path))
+
+        self.shelf['broken_pickle'] = {}
+        path = self.shelf.key_file('broken_pickle')
+        with open(path, 'w') as f:
+            f.write(BROKEN_PICKLE)
+        self.assertRaises(KeyError, self.shelf.__getitem__, 'broken_pickle')
+        self.assertEquals(1, len(list(self.shelf.items())))
+        self.assertFalse(os.path.exists(path))
+
 
 class CachedFileShelfTests(TestFileShelf):
     """TestFileShelf tests but using CachedFileShelf"""
@@ -273,7 +309,7 @@
         self.shelf['realkey']
         self.assertEquals(self.shelf.cache_hits, 1)
 
-    def test_broked_metadata_with_backup(self):
+    def test_broken_metadata_with_backup(self):
         """overrides parent test as we have the value in the cache."""
         self.shelf['bad_file'] = {'value':'old'}
         path = self.shelf.key_file('bad_file')

=== modified file 'tests/syncdaemon/test_fileshelf.pyc'
Binary files tests/syncdaemon/test_fileshelf.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_fileshelf.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2010-02-17 23:51:29 +0000
+++ tests/syncdaemon/test_fsm.py	2010-03-31 23:55:45 +0000
@@ -24,12 +24,11 @@
 import shutil
 import unittest
 import time
-import logging
 
 from contrib.testing.testcase import (
     FakeVolumeManager,
     FakeMain,
-    MementoHandler,
+    MementoHandler
 )
 
 from ubuntuone.syncdaemon.filesystem_manager import (
@@ -39,7 +38,6 @@
     METADATA_VERSION,
 )
 from ubuntuone.syncdaemon.event_queue import EventQueue
-from ubuntuone.syncdaemon.logger import LOGFILENAME
 from ubuntuone.syncdaemon import logger
 from ubuntuone.syncdaemon.volume_manager import Share, allow_writes
 
@@ -74,11 +72,19 @@
                                             self.fsm, self.shares_dir)
         self.share_path = self.share.path
 
+        # add a in-memory logger handler
+        self.memento = MementoHandler()
+        self.memento.setLevel(0)
+        logger.root_logger.addHandler(self.memento)
+
     def tearDown(self):
         """ Clean up the tests. """
         self.eq.shutdown()
         self.rmtree(TESTS_DIR)
 
+        # remove the handler
+        logger.root_logger.removeHandler(self.memento)
+
     @staticmethod
     def rmtree(path):
         """rmtree that handle ro childs."""
@@ -101,6 +107,16 @@
         fsm.vm.add_share(share)
         return share
 
+    def create_node(self, name, is_dir=False, share=None):
+        """Create a node."""
+        if share is None:
+            share = self.share
+        path = os.path.join(share.path, name)
+        mdid = self.fsm.create(path, share.volume_id, is_dir=is_dir)
+        self.fsm.set_node_id(path, "uuid1")
+        mdobj = self.fsm.get_by_mdid(mdid)
+        return mdobj
+
 
 class StartupTests(unittest.TestCase):
     """Test the basic startup behaviour."""
@@ -1238,17 +1254,89 @@
                           self.fsm._set_node_id, mdobj, 'bad-uuid', path)
 
 
+class GetMDObjectsInDirTests(FSMTestCase):
+    """Test the get_mdobjs_in_dir method."""
+
+    def create_some_contents(self, share):
+        a = 'a'
+        ab = os.path.join(a, 'b')
+        ab1 = os.path.join(a, 'b1')
+        ab2 = os.path.join(a, 'b2')
+        ac = os.path.join(a, 'c')
+        acd = os.path.join(ac, 'd')
+
+        dirs = [a, ab, ab1, ab2, ac, acd]
+        for d in dirs:
+            self.create_node(d, is_dir=True, share=share)
+
+        x = os.path.join(a, 'x.txt')
+        y = os.path.join(ab, 'y.txt')
+        z = os.path.join(ac, 'z.txt')
+
+        files = [x, y, z]
+        for f in files:
+            self.create_node(f, is_dir=False, share=share)
+
+        self.contents[share] = sorted(dirs + files)
+
+    def setUp(self):
+        """Init."""
+        FSMTestCase.setUp(self)
+        self.contents = {}
+        self.create_some_contents(self.share)
+
+    def tearDown(self):
+        """Clean up."""
+        self.contents = {}
+        FSMTestCase.tearDown(self)
+
+    def test_basic(self):
+        """Test basic retrieval."""
+        expected = ['a']
+        actual = sorted([d.path for d in
+                         self.fsm.get_mdobjs_in_dir(self.share.path)])
+        self.assertEqual(expected, actual)
+
+    def test_no_tree(self):
+        """Test just receiving the dir and not the tree."""
+        expected = ['a/b', 'a/b1', 'a/b2', 'a/c', 'a/x.txt']
+        actual = sorted([d.path for d in self.fsm.get_mdobjs_in_dir(
+                                    os.path.join(self.share.path, 'a'))])
+        self.assertEqual(expected, actual)
+
+    def test_similar_paths(self):
+        """Test having similar paths (a/b, a/b1, a/b2)."""
+        expected = ['a/b/y.txt']
+        actual = sorted([d.path for d in self.fsm.get_mdobjs_in_dir(
+                                    os.path.join(self.share.path, 'a', 'b'))])
+        self.assertEqual(expected, actual)
+
+    def test_with_two_shares(self):
+        """Test having 2 shares."""
+        second_share = self.create_share('second_share', 'the_second',
+                                          self.fsm, self.shares_dir)
+        self.create_some_contents(second_share)
+
+        expected = ['a']
+        actual = sorted([d.path for d in
+                         self.fsm.get_mdobjs_in_dir(second_share.path)])
+        self.assertEqual(expected, actual)
+
+    def test_both_shares(self):
+        """Test having 2 shares and asking for mdobjs in shares_dir."""
+        second_share = self.create_share('second_share', 'the_second',
+                                          self.fsm, self.shares_dir)
+        self.create_some_contents(second_share)
+
+        expected = []
+        actual = sorted([d.path for d in
+                         self.fsm.get_mdobjs_in_dir(self.shares_dir)])
+        self.assertEqual(expected, actual)
+
+
 class StatTests(FSMTestCase):
     """Test all the behaviour regarding the stats."""
 
-    def create_node(self, name):
-        """Creates a node."""
-        path = os.path.join(self.share.path, name)
-        mdid = self.fsm.create(path, self.share.volume_id)
-        self.fsm.set_node_id(path, "uuid1")
-        mdobj = self.fsm.get_by_mdid(mdid)
-        return mdobj
-
     def test_create_nofile(self):
         """Test creation when there's no file."""
         mdobj = self.create_node("foo")
@@ -1866,13 +1954,48 @@
         assert self.fsm.changed(path=local_file) == self.fsm.CHANGED_LOCAL
         self.assertRaises(OSError, self.fsm.delete_file, local_dir)
 
+    def test_delete_dir_when_non_empty_and_prior_conflict_on_file(self):
+        """Test that a dir is not deleted, when there is a conflicted file."""
+        # local directory
+        local_dir = os.path.join(self.root_dir, "foo")
+        os.mkdir(local_dir)
+        self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.set_node_id(local_dir, "uuid")
+
+        local_file = os.path.join(local_dir,
+                                  "bar.txt" + self.fsm.CONFLICT_SUFFIX)
+        open(local_file, 'w').close() # touch bar.txt.u1conflict
+
+        assert not local_file in self.fsm._idx_path
+        self.assertRaises(OSError, self.fsm.delete_file, local_dir)
+
+        infos = [record.message for record in self.memento.records
+                 if record.levelname == 'INFO']
+        self.assertTrue(len(infos) == 1)
+        self.assertTrue(local_file in infos[0])
+
+    def test_delete_dir_when_non_empty_and_prior_conflict_on_subdir(self):
+        """Test that a dir is not deleted, when there is a conflicted dir."""
+        # local directory
+        local_dir = os.path.join(self.root_dir, "foo")
+        os.mkdir(local_dir)
+        self.fsm.create(local_dir, "", is_dir=True)
+        self.fsm.set_node_id(local_dir, "uuid")
+
+        local_subdir = os.path.join(local_dir,
+                                    "subdir_bar" + self.fsm.CONFLICT_SUFFIX)
+        os.mkdir(local_subdir)
+
+        assert not local_subdir in self.fsm._idx_path
+        self.assertRaises(OSError, self.fsm.delete_file, local_dir)
+
+        infos = [record.message for record in self.memento.records
+                 if record.levelname == 'INFO']
+        self.assertTrue(len(infos) == 1)
+        self.assertTrue(local_subdir in infos[0])
+
     def test_no_warning_on_log_file_when_recursive_delete(self):
         """Test that sucessfully deleted dir does not log OSError."""
-        # add a in-memory handler
-        memento = MementoHandler()
-        memento.setLevel(logging.WARNING)
-        logger.root_logger.addHandler(memento)
-
         local_dir = os.path.join(self.root_dir, "foo")
         os.mkdir(local_dir)
         self.fsm.create(local_dir, "", is_dir=True)
@@ -1883,20 +2006,15 @@
         self.fsm.create(local_file, "")
         self.fsm.set_node_id(local_file, "uuid_file")
 
+        previous = self.memento.records
         self.fsm.delete_file(local_dir)
 
-        # remove the handler
-        logger.root_logger.removeHandler(memento)
-        self.assertFalse(memento.records, memento.records)
+        # no logs were added
+        self.assertEquals(previous, self.memento.records)
 
-    # FIXME: Bug #494469
-    def SKIP_test_warning_on_log_file_when_failing_delete(self):
+    def test_warning_on_log_file_when_failing_delete(self):
         """Test that sucessfully deleted dir does not log OSError."""
 
-        log = open(LOGFILENAME, 'r')
-        log.flush()
-        log.read() # ignore log content till now
-
         local_dir = os.path.join(self.root_dir, "foo")
         self.fsm.create(local_dir, "", is_dir=True)
         self.fsm.set_node_id(local_dir, "uuid")
@@ -1904,11 +2022,11 @@
         # local_dir does not exist on the file system
         self.fsm.delete_file(local_dir)
 
-        log.flush()
-        log_content = log.read()
-        log.close()
-        log_present = 'OSError [Errno 2] No such file or directory' in log_content
-        self.assertTrue(log_present)
+        warnings = [record.message for record in self.memento.records
+                    if record.levelname == 'WARNING']
+        self.assertTrue(len(warnings) == 1)
+        self.assertTrue('OSError [Errno 2]' in warnings[0])
+        self.assertTrue(local_dir in warnings[0])
 
     def test_move_dir_to_conflict(self):
         """Test that the conflict to a dir removes children metadata."""
@@ -2779,6 +2897,162 @@
         self.assertFalse(("", "uuid3", "") in data)
 
 
+class MutingTestCase(FSMTestCase):
+    """Test FSM interaction with mutes."""
+
+    def setUp(self):
+        """Set up the test infrastructure."""
+        FSMTestCase.setUp(self)
+        self.muted = []
+
+        # in-the-middle add
+        self._orig_add_mute = self.eq.add_to_mute_filter
+        def _fake_add(*a):
+            """Store what is added."""
+            self.muted.append(a)
+            return self._orig_add_mute(*a)
+        self.eq.add_to_mute_filter = _fake_add
+
+        # in-the-middle remove
+        self._orig_rm_mute = self.eq.rm_from_mute_filter
+        def _fake_rm(*a):
+            """Store what is deleted."""
+            self.muted.remove(a)
+            return self._orig_rm_mute(*a)
+        self.eq.rm_from_mute_filter = _fake_rm
+
+    def tearDown(self):
+        """Put original stuff back in."""
+        FSMTestCase.tearDown(self)
+        self.eq.add_to_mute_filter = self._orig_add_mute
+        self.eq.rm_from_mute_filter = self._orig_rm_mute
+
+    def test_movefile_ok(self):
+        """Move file adds a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        path2 = os.path.join(self.share.path, "thisfile2")
+        open(path1, "w").close()
+        self.create_node(path1)
+
+        # move and check
+        self.fsm.move_file("share", path1, path2)
+        self.assertEqual(self.muted, [('FS_FILE_MOVE', path1, path2)])
+
+    def test_movefile_error(self):
+        """Move file adds and removes a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        path2 = os.path.join(self.share.path, "thisfile2")
+        self.create_node(path1)
+
+        # move and check
+        self.fsm.move_file("share", path1, path2)
+        self.assertEqual(self.muted, [])
+
+    def test_movedir_ok(self):
+        """Move dir adds a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        path2 = os.path.join(self.share.path, "thisfile2")
+        os.mkdir(path1)
+        self.create_node(path1, is_dir=True)
+
+        # move and check
+        self.fsm.move_file("share", path1, path2)
+        self.assertEqual(self.muted, [('FS_DIR_MOVE', path1, path2)])
+
+    def test_movedir_error(self):
+        """Move dir adds and removes a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        path2 = os.path.join(self.share.path, "thisfile2")
+        self.create_node(path1, is_dir=True)
+
+        # move and check
+        self.fsm.move_file("share", path1, path2)
+        self.assertEqual(self.muted, [])
+
+    def test_deletefile_ok(self):
+        """Delete file adds a mute filter."""
+        testfile = os.path.join(self.share_path, "path")
+        open(testfile, "w").close()
+        self.fsm.create(testfile, "share")
+        self.fsm.set_node_id(testfile, "uuid")
+
+        # delete and check
+        self.fsm.delete_file(testfile)
+        self.assertEqual(self.muted, [('FS_FILE_DELETE', testfile)])
+
+    def test_deletefile_error(self):
+        """Delete file adds and removes a mute filter."""
+        testfile = os.path.join(self.share_path, "path")
+        self.fsm.create(testfile, "share")
+        self.fsm.set_node_id(testfile, "uuid")
+
+        # delete and check
+        self.fsm.delete_file(testfile)
+        self.assertEqual(self.muted, [])
+
+    def test_deletedir_ok(self):
+        """Delete dir adds a mute filter."""
+        testfile = os.path.join(self.share_path, "path")
+        os.mkdir(testfile)
+        self.fsm.create(testfile, "share", is_dir=True)
+        self.fsm.set_node_id(testfile, "uuid")
+
+        # delete and check
+        self.fsm.delete_file(testfile)
+        self.assertEqual(self.muted, [('FS_DIR_DELETE', testfile)])
+
+    def test_deletedir_error(self):
+        """Delete dir adds and removes a mute filter."""
+        testfile = os.path.join(self.share_path, "path")
+        self.fsm.create(testfile, "share", is_dir=True)
+        self.fsm.set_node_id(testfile, "uuid")
+
+        # delete and check
+        self.fsm.delete_file(testfile)
+        self.assertEqual(self.muted, [])
+
+    def test_conflict_movefile_ok(self):
+        """Move file when conflict adds a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        open(path1, "w").close()
+        mdobj = self.create_node(path1)
+
+        # move and check
+        self.fsm.move_to_conflict(mdobj.mdid)
+        self.assertEqual(self.muted,
+                         [('FS_FILE_MOVE', path1, path1 + '.u1conflict')])
+
+    def test_conflict_movefile_error(self):
+        """Move file when conflict adds and removes a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        mdobj = self.create_node(path1)
+
+        # move and check
+        self.fsm.move_to_conflict(mdobj.mdid)
+        self.assertEqual(self.muted, [])
+
+    def test_conflict_movedir_ok(self):
+        """Move dir when conflict adds a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        os.mkdir(path1)
+        mdobj = self.create_node(path1, is_dir=True)
+
+        # move and check
+        self.fsm.move_to_conflict(mdobj.mdid)
+        self.assertEqual(self.muted,
+                         [('FS_DIR_MOVE', path1, path1 + '.u1conflict')])
+
+    def test_conflict_movedir_error(self):
+        """Move dir when conflict adds and removes a mute filter."""
+        path1 = os.path.join(self.share.path, "thisfile1")
+        mdobj = self.create_node(path1, is_dir=True)
+
+        # move and check
+        self.fsm.move_to_conflict(mdobj.mdid)
+        self.assertEqual(self.muted, [])
+
+
+
 def test_suite():
     # pylint: disable-msg=C0111
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'tests/syncdaemon/test_fsm.pyc'
Binary files tests/syncdaemon/test_fsm.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_fsm.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_hashqueue.py'
--- tests/syncdaemon/test_hashqueue.py	2010-02-17 23:51:29 +0000
+++ tests/syncdaemon/test_hashqueue.py	2010-03-31 23:55:45 +0000
@@ -531,7 +531,7 @@
         receiver = Helper()
         hq = hash_queue.HashQueue(receiver)
         hq.shutdown()
-        self.assertRaises(RuntimeError, hq.insert, 'foo', "mdid")
+        self.assertTrue(hq._stopped)
 
     def test_shutdown_while_hashing(self):
         """Test that the HashQueue is shutdown ASAP while it's hashing."""
@@ -573,7 +573,8 @@
         receiver = Helper()
         hq = hash_queue.HashQueue(receiver)
         hq.shutdown()
-        self.assertRaises(RuntimeError, hq.insert, '/foo/bar', "mdid")
+        hq.insert('foo', 'mdid')
+        self.assertFalse(hq.is_hashing('foo', 'mdid'))
 
 
 class UniqueQueueTests(TwistedTestCase):

=== modified file 'tests/syncdaemon/test_hashqueue.pyc'
Binary files tests/syncdaemon/test_hashqueue.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_hashqueue.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-03-31 23:55:45 +0000
@@ -48,7 +48,7 @@
     def _fake(self, *a):
         """fake"""
     inotify_add_watch = inotify_has_watch = freeze_rollback = is_frozen = _fake
-    freeze_begin = add_to_mute_filter = _fake
+    inotify_rm_watch = freeze_begin = add_to_mute_filter = _fake
 
     def freeze_commit(self, events):
         """just store events"""
@@ -302,6 +302,42 @@
         self.assertTrue(isinstance(d, defer.Deferred))
         return d
 
+    def test_start_without_udf_itself(self):
+        """LR start() having removed UDFs."""
+        vol_to_unsub = self.volumes[0]
+        vol_to_keep = self.volumes[1:]
+        shutil.rmtree(vol_to_unsub.path)
+        d = self.lr.start()
+
+        def check(_):
+            """Removed UDF should be desubscribed."""
+            # these should remain ok
+            for vol in vol_to_keep:
+                self.assertTrue(vol.subscribed)
+            # this should be unsubscribed
+            self.assertFalse(vol_to_unsub.subscribed)
+
+        d.addCallback(check)
+        return d
+
+    def test_start_without_udf_ancestors(self):
+        """LR start() having removed UDFs parents."""
+        vol_to_unsub = self.volumes[-1]  # grab the one that has lot of parents
+        vol_to_keep = self.volumes[:-1]
+        shutil.rmtree(os.path.dirname(vol_to_unsub.path))
+        d = self.lr.start()
+
+        def check(_):
+            """Removed UDF should be desubscribed."""
+            # these should remain ok
+            for vol in vol_to_keep:
+                self.assertTrue(vol.subscribed)
+            # this should be unsubscribed
+            self.assertFalse(vol_to_unsub.subscribed)
+
+        d.addCallback(check)
+        return d
+
 
 class TwistedBase(BaseTestCase):
     """Base class for twisted tests."""
@@ -503,6 +539,20 @@
         self.scanTest(check)
         return self.deferred
 
+    def test_no_file_no_hash(self):
+        """Test useless metadata."""
+        path = os.path.join(self.share.path, "b")
+        self.fsm.create(path, self.share.volume_id)
+        self.assertTrue(self.fsm.has_metadata(path=path))
+
+        def check(_):
+            """Check."""
+            self.assertEqual(self.eq.pushed, [])
+            self.assertFalse(self.fsm.has_metadata(path=path))
+
+        self.startTest(check)
+        return self.deferred
+
     def test_disc_less_dir_normal(self):
         """Test having less in disc than in metadata, normal volume."""
         # create a node in the share, but no in disk

=== modified file 'tests/syncdaemon/test_localrescan.pyc'
Binary files tests/syncdaemon/test_localrescan.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_localrescan.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_logger.pyc'
Binary files tests/syncdaemon/test_logger.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_logger.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_main.pyc'
Binary files tests/syncdaemon/test_main.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_main.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_states.py'
--- tests/syncdaemon/test_states.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_states.py	2010-03-31 23:55:45 +0000
@@ -21,6 +21,7 @@
 from twisted.internet import defer, reactor
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
+from contrib.testing.testcase import FakeLogger
 from ubuntuone.syncdaemon.states import (
     StateManager, ConnectionManager, QueueManager, Node
 )
@@ -121,27 +122,6 @@
             return object.__getattribute__(self, name)
 
 
-
-class FakeLogger(object):
-    """Helper logging class."""
-    def __init__(self):
-        self.logged = dict(debug=[], warning=[])
-
-    def _log(self, log, txt, args):
-        """Really logs."""
-        if args:
-            txt = txt % args
-        log.append(txt)
-
-    def warning(self, txt, *args):
-        """WARNING logs."""
-        self._log(self.logged['warning'], txt, args)
-
-    def debug(self, txt, *args):
-        """DEBUG logs."""
-        self._log(self.logged['debug'], txt, args)
-
-
 class Base(TwistedTestCase):
     """Base class for state tests."""
     def setUp(self):
@@ -959,6 +939,13 @@
             d.append(self.check(node, 'SYS_UNKNOWN_ERROR', 'UNKNOWN_ERROR'))
         return defer.DeferredList(d)
 
+    def test_root_mismatch_error(self):
+        """All nodes go to root_mismatch."""
+        d = []
+        for node in self.sm_nodes_ok:
+            d.append(self.check(node, 'SYS_ROOT_MISMATCH', 'ROOT_MISMATCH'))
+        return defer.DeferredList(d)
+
     def test_not_exiting_from_errors(self):
         """No return from errors."""
         d = []

=== modified file 'tests/syncdaemon/test_states.pyc'
Binary files tests/syncdaemon/test_states.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_states.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_sync.pyc'
Binary files tests/syncdaemon/test_sync.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_sync.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_tools.pyc'
Binary files tests/syncdaemon/test_tools.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_tools.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_u1fsfsm.pyc'
Binary files tests/syncdaemon/test_u1fsfsm.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_u1fsfsm.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_u1sdtool.py'
--- tests/syncdaemon/test_u1sdtool.py	2010-03-10 23:36:53 +0000
+++ tests/syncdaemon/test_u1sdtool.py	2010-03-31 23:55:45 +0000
@@ -103,6 +103,14 @@
 
     def test_show_path_info_unicode(self):
         """test the output of --info with unicode paths """
+        return self.generic_test_show_path_info_unicode('utf-8')
+
+    def test_show_path_info_unicode_pipe(self):
+        """test the output of --info with unicode paths going to e.g. a pipe"""
+        return self.generic_test_show_path_info_unicode(None)
+
+    def generic_test_show_path_info_unicode(self, encoding):
+        """generic test for the output of --info with unicode paths """
         path = os.path.join(self.root_dir, "ñoño")
         mdid = self.fs_manager.create(path, "")
         self.fs_manager.set_node_id(path, "uuid1")
@@ -117,7 +125,7 @@
         self.fs_manager.remove_partial("uuid1", "")
         d = self.tool.get_metadata(path)
         out = StringIO()
-        out.encoding = 'utf-8'
+        out.encoding = encoding
         expected = """ File: %(path_info)s
   info_created: %(info_created)s
   info_is_partial: %(info_is_partial)s
@@ -136,7 +144,10 @@
 """
         # the callback, pylint: disable-msg=C0111
         def callback(result):
-            result.update(dict(path_info=path.decode(out.encoding)))
+            if encoding is not None:
+                result.update(dict(path_info=path.decode(encoding)))
+            else:
+                result.update(dict(path_info=path))
             for k, v in result.copy().items():
                 result[k] = v.decode('utf-8')
             value = expected % result

=== modified file 'tests/syncdaemon/test_u1sdtool.pyc'
Binary files tests/syncdaemon/test_u1sdtool.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_u1sdtool.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-03-04 16:47:43 +0000
+++ tests/syncdaemon/test_vm.py	2010-03-31 23:55:45 +0000
@@ -1819,7 +1819,8 @@
         for new_key in new_keys:
             self.assertIn(new_key, old_keys)
         # check the old data is still there (in the backup)
-        backup_shelf = LegacyShareFileShelf(os.path.join(self.vm_data_dir, '0.bkp'))
+        bkp_dir = os.path.join(os.path.dirname(self.vm_data_dir), '5.bkp', '0.bkp')
+        backup_shelf = LegacyShareFileShelf(bkp_dir)
         backup_keys = [key for key in backup_shelf.keys()]
         for old_key in old_keys:
             self.assertIn(old_key, backup_keys)
@@ -2420,6 +2421,183 @@
             self.assertEquals(udf.suggested_path, old_udf.suggested_path)
             self.assertEquals(udf.subscribed, old_udf.subscribed)
 
+    def test_upgrade_5_partial_upgrade(self):
+        """Test migration from version 5 with upgrade to 6 unfinished."""
+        # build a fake version 5 state
+        self._build_layout_version_4()
+        self.set_md_version('5')
+        self.udfs_md_dir = os.path.join(self.vm_data_dir, 'udfs')
+        # create some old shares and shared metadata
+        legacy_shares = LegacyShareFileShelf(self.share_md_dir)
+        root_share = _Share(path=self.root_dir, share_id='',
+                            access_level='Modify', node_id=str(uuid.uuid4()))
+        legacy_shares[''] = root_share
+        for idx, name in enumerate(['share'] * 3):
+            sid = str(uuid.uuid4())
+            share_name = name + '_' + str(idx)
+            share = _Share(path=os.path.join(self.shares_dir, share_name),
+                           share_id=sid, name=share_name,
+                           node_id=str(uuid.uuid4()),
+                           other_username='username'+str(idx),
+                           other_visible_name='visible name ' + str(idx))
+            if idx == 0:
+                share.access_level = 'Modify'
+                legacy_shares[sid] = share
+            elif idx == 1:
+                share.access_level = 'View'
+                legacy_shares[sid] = share
+            else:
+                # add a 'new' Share dict to the shelf
+                share.access_level = 'Modify'
+                share = Share(path=share.path,
+                               volume_id=share.id, name=share.name,
+                               access_level=share.access_level,
+                               other_username=share.other_username,
+                               other_visible_name=share.other_visible_name,
+                               node_id=share.subtree)
+                legacy_shares[sid] = share.__dict__
+
+        # create shared shares
+        legacy_shared = LegacyShareFileShelf(self.shared_md_dir)
+        for idx, name in enumerate(['dir'] * 3):
+            sid = str(uuid.uuid4())
+            share_name = name + '_' + str(idx)
+            share = _Share(path=os.path.join(self.root_dir, share_name),
+                           share_id=sid, node_id=str(uuid.uuid4()),
+                           name=share_name, other_username='hola',
+                           other_visible_name='hola')
+            if idx == 0:
+                share.access_level = 'Modify'
+                legacy_shares[sid] = share
+            elif idx == 1:
+                share.access_level = 'View'
+                legacy_shares[sid] = share
+            else:
+                # add a 'new' Shared dict to the shelf
+                share.access_level = 'Modify'
+                share = Shared(path=share.path,
+                               volume_id=share.id, name=share.name,
+                               access_level=share.access_level,
+                               other_username=share.other_username,
+                               other_visible_name=share.other_visible_name,
+                               node_id=share.subtree)
+                legacy_shares[sid] = share.__dict__
+
+        # keep a copy of the current shares and shared metadata to check
+        # the upgrade went ok
+        legacy_shares = dict(legacy_shares.items())
+        legacy_shared = dict(legacy_shared.items())
+
+        if self.md_version_None:
+            self.set_md_version('')
+        # upgrade it!
+        self.main = FakeMain(self.root_dir, self.shares_dir,
+                             self.data_dir, self.partials_dir)
+        vm = self.main.vm
+        def compare_share(share, old_share):
+            """Compare two shares, new and old"""
+            old_id = getattr(old_share, 'id', None)
+            if old_id is None:
+                old_id = old_share['volume_id']
+            self.assertEquals(share.volume_id, old_id)
+            self.assertEquals(share.path,
+                getattr(old_share, 'path', None) or old_share['path'])
+            self.assertEquals(share.node_id,
+                getattr(old_share, 'subtree', None) or old_share['node_id'])
+            if not isinstance(share, Root):
+                self.assertEquals(share.name,
+                    getattr(old_share, 'name', None) or old_share['name'])
+                self.assertEquals(share.other_username,
+                    getattr(old_share, 'other_username', None) \
+                                  or old_share['other_username'])
+                self.assertEquals(share.other_visible_name,
+                    getattr(old_share, 'other_visible_name', None) \
+                                  or old_share['other_visible_name'])
+                self.assertEquals(share.access_level,
+                    getattr(old_share, 'access_level', None) \
+                                  or old_share['access_level'])
+
+        for sid in vm.shares:
+            old_share = legacy_shares[sid]
+            share = vm.shares[sid]
+            self.assertTrue(isinstance(share, Share) or isinstance(share, Root))
+            compare_share(share, old_share)
+
+        for sid in vm.shared:
+            old_share = legacy_shared[sid]
+            share = vm.shared[sid]
+            self.assertTrue(isinstance(share, Shared))
+            compare_share(share, old_share)
+
+    def test_upgrade_5_critical_error(self):
+        """Test the migration from version 5 with a critical error."""
+        # build a fake version 5 state
+        self._build_layout_version_4()
+        self.set_md_version('5')
+        # create some old shares and shared metadata
+        legacy_shares = LegacyShareFileShelf(self.share_md_dir)
+        root_share = _Share(path=self.root_dir, share_id='',
+                            access_level='Modify')
+        legacy_shares[''] = root_share
+        for idx, name in enumerate(['share'] * 10):
+            sid = str(uuid.uuid4())
+            share_name = name + '_' + str(idx)
+            share = _Share(path=os.path.join(self.shares_dir, share_name),
+                           share_id=sid, name=share_name,
+                           node_id=str(uuid.uuid4()),
+                           other_username='username'+str(idx),
+                           other_visible_name='visible name ' + str(idx))
+            if idx % 2:
+                share.access_level = 'Modify'
+            else:
+                share.access_level = 'View'
+            legacy_shares[sid] = share
+        # create shared shares
+        legacy_shared = LegacyShareFileShelf(self.shared_md_dir)
+        for idx, name in enumerate(['dir'] * 5):
+            sid = str(uuid.uuid4())
+            share_name = name + '_' + str(idx)
+            share = _Share(path=os.path.join(self.root_dir, share_name),
+                           share_id=sid, node_id=str(uuid.uuid4()),
+                           name=share_name, other_username='hola',
+                           other_visible_name='hola')
+            if idx % 2:
+                share.access_level = 'Modify'
+            else:
+                share.access_level = 'View'
+            legacy_shared[sid] = share
+
+        # keep a copy of the current shares and shared metadata to check
+        # the upgrade went ok
+        legacy_shares = dict(legacy_shares.items())
+        legacy_shared = dict(legacy_shared.items())
+
+        if self.md_version_None:
+            self.set_md_version('')
+        # upgrade it!
+        old_upgrade_share_to_volume = MetadataUpgrader._upgrade_share_to_volume
+        def upgrade_share_to_volume(share, shared=False):
+            raise ValueError('FAIL!')
+        MetadataUpgrader._upgrade_share_to_volume = upgrade_share_to_volume
+        try:
+            self.assertRaises(ValueError, FakeMain, self.root_dir, self.shares_dir,
+                              self.data_dir, self.partials_dir)
+        finally:
+            MetadataUpgrader._upgrade_share_to_volume = old_upgrade_share_to_volume
+
+        shares = LegacyShareFileShelf(self.share_md_dir)
+        self.assertEquals(len(list(shares.keys())), len(legacy_shares.keys()))
+        for sid, share in shares.iteritems():
+            old_share = legacy_shares[sid]
+            self.assertTrue(isinstance(share, _Share))
+            self.assertTrue(isinstance(old_share, _Share))
+        shared = LegacyShareFileShelf(self.shared_md_dir)
+        self.assertEquals(len(list(shared.keys())), len(legacy_shared.keys()))
+        for sid, share in shared.iteritems():
+            old_share = legacy_shared[sid]
+            self.assertTrue(isinstance(share, _Share))
+            self.assertTrue(isinstance(old_share, _Share))
+
 
 class BrokenOldMDVersionUpgradeTests(MetadataOldLayoutTests):
     """MetadataOldLayoutTests with broken .version file."""
@@ -2520,3 +2698,11 @@
         version = self.md_upgrader._guess_metadata_version()
         self.assertEquals(version, '6')
 
+    def test_guess_mixed_metadata_5_and_6(self):
+        """Test _guess_metadata_version method for mixed version 5 and 6."""
+        # fake a version 6 layout and metadata
+        shelf = LegacyShareFileShelf(self.share_md_dir)
+        shelf['old_share'] = _Share(path='/foo/bar', share_id='old_share')
+        shelf['new_share'] = Share(path='/bar/foo', volume_id='new_share').__dict__
+        version = self.md_upgrader._guess_metadata_version()
+        self.assertEquals(version, '5')

=== modified file 'tests/syncdaemon/test_vm.pyc'
Binary files tests/syncdaemon/test_vm.pyc	2010-03-10 23:36:53 +0000 and tests/syncdaemon/test_vm.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/test_login.pyc'
Binary files tests/test_login.pyc	2010-03-10 23:36:53 +0000 and tests/test_login.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/test_preferences.py'
--- tests/test_preferences.py	2010-03-10 23:36:53 +0000
+++ tests/test_preferences.py	2010-03-31 23:55:45 +0000
@@ -21,7 +21,7 @@
 import os
 import gnomekeyring
 
-from contrib.mocker import MockerTestCase, KWARGS
+from contrib.mocker import MockerTestCase
 from contrib.testing.testcase import DBusTwistedTestCase, FakeLogin
 from twisted.internet import defer
 from twisted.python.failure import Failure
@@ -48,7 +48,6 @@
 
         # For testing keyring queries
         self.keyring = self.mocker.mock()
-        self.u1prefs.httplib2 = self.mocker.mock()
         self.item = self.mocker.mock(gnomekeyring.Found)
 
         self.item_id = 999
@@ -72,6 +71,8 @@
         self.mocker.count(0, None)
         self.mocker.result(None)
 
+        self.u1prefs.make_rest_request = self.make_rest_request
+
     def tearDown(self):
         # collect all signal receivers registered during the test
         signal_receivers = set()
@@ -88,10 +89,19 @@
         d.addBoth(lambda _: DBusTwistedTestCase.tearDown(self))
         return d
 
+    def make_rest_request(self, url=None, method='GET',
+                          callback=None, keyring=None):
+        """Override the real request call to mock some stuff."""
+        if callback:
+            callback(self.content)
+        else:
+            raise Exception('No callback provided.')
+
     def test_bw_throttling(self):
         """Test that toggling bw throttling works correctly."""
         self.mocker.replay()
         widget = self.u1prefs.DevicesWidget(None, keyring=self.keyring)
+        widget.update_bw_settings = self.mocker.mock()
         try:
             widget.devices = []
             widget.list_devices()
@@ -116,6 +126,7 @@
     def test_list_devices_fills_devices_list_with_fake_result_when_empty(self):
         self.mocker.replay()
         widget = self.u1prefs.DevicesWidget(None, keyring=self.keyring)
+        widget.update_bw_settings = self.mocker.mock()
         try:
             widget.devices = []
             widget.list_devices()
@@ -129,6 +140,7 @@
     def test_list_devices_shows_devices_list(self):
         self.mocker.replay()
         widget = self.u1prefs.DevicesWidget(None, keyring=self.keyring)
+        widget.update_bw_settings = self.mocker.mock()
         try:
             widget.devices = []
             widget.list_devices()
@@ -159,6 +171,7 @@
     def test_list_devices_shows_real_devices_list(self):
         self.mocker.replay()
         widget = self.u1prefs.DevicesWidget(None, keyring=self.keyring)
+        widget.update_bw_settings = self.mocker.mock()
         try:
             widget.devices = [{'kind': 'Computer',
                                'description': 'xyzzy',
@@ -203,12 +216,7 @@
 
     def test_request_quota_info(self):
         """Test that we can request the quota info properly."""
-        response = { 'status' : '200' }
-        content = '{"total":2048, "used":1024}'
-        client = self.mocker.mock()
-        self.expect(self.u1prefs.httplib2.Http()).result(client)
-        self.expect(client.request('https://one.ubuntu.com/api/quota/',
-                                   'GET', KWARGS)).result((response, content))
+        self.content = {"total":2048, "used":1024}
         self.mocker.replay()
         dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
         self.assertTrue(dialog is not None)
@@ -217,23 +225,116 @@
         self.assertEqual(dialog.usage_graph.get_fraction(), 0.5)
         dialog.destroy()
 
+    def test_no_overquota_notice_on_low_usage(self):
+        """Test that the quota notice is not visible if usage is low."""
+        self.content = {"total":2048, "used":1024}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # the label should just be the blank '\n'
+        self.assertEqual(dialog.overquota_label.get_text(), '\n')
+        # and the icon should be blank, too
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0], None)
+        dialog.destroy()
+
+    def test_overquota_notice_and_upgrade_offer_on_free_high_usage(self):
+        """Test that the quota notice is visible if usage is 95%.
+
+        Also make sure the label mentions upgrading.
+        """
+        self.content = {"total": 100, "used": 95}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' in dialog.overquota_label.get_text().lower())
+        # and check that the icon used is just informational
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-information')
+        dialog.destroy()
+
+    def test_overquota_notice_and_not_upgrade_offer_on_paid_high_usage(self):
+        """Test that the quota notice is visible if usage is 95%.
+
+        Also make sure the label does not mention upgrading.
+        """
+        self.content = {"total": 50<<30, "used": 49<<30}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' not in
+                        dialog.overquota_label.get_text().lower())
+        # and check that the icon used is just informational
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-information')
+        dialog.destroy()
+
+    def test_overquota_warning_and_upgrade_offer_there_on_free_over_quota(self):
+        """Test that the quota notice is visible if usage is 100%.
+
+        Also make sure the label mentions upgrading.
+        """
+        self.content = {"total": 100, "used": 100}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' in dialog.overquota_label.get_text().lower())
+        # and check that the icon used is a warning
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-warning')
+        dialog.destroy()
+
+    def test_overquota_warning_there_on_paid_over_quota(self):
+        """Test that the quota notice is visible if usage is 100%."""
+        self.content = {"total": 50<<30, "used": 50<<30}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that the icon used is a warning
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-warning')
+        dialog.destroy()
+
     def test_request_account_info(self):
         """Test that we can request the account info properly."""
-        response = { 'status' : '200' }
-        content = '''{"username": "ubuntuone", "nickname": "Ubuntu One",
-                     "email": "[e-mail]"}
-                  '''
-        client = self.mocker.mock()
-        self.expect(self.u1prefs.httplib2.Http()).result(client)
-        self.expect(client.request('https://one.ubuntu.com/api/account/',
-                                   'GET', KWARGS)).result((response, content))
+        self.content = {"username": "ubuntuone", "nickname": "Ubuntu One",
+                        "email": "[e-mail]"}
         self.mocker.replay()
         dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
         self.assertTrue(dialog is not None)
         dialog.request_account_info()
+        self.content = {"total":2048, "used":1024}
+        dialog.request_quota_info()
         self.assertEqual(dialog.name_label.get_text(), 'Ubuntu One')
-        self.assertEqual(dialog.user_label.get_text(), 'ubuntuone')
         self.assertEqual(dialog.mail_label.get_text(), '[e-mail]')
+        # ensure the plan label says "Free" and the upgrade button is there
+        self.assertEqual(dialog.plan_label.get_text(), 'Free')
+        self.assertTrue(dialog.upgrade_link.get_visible())
+        # whoops, the user upgraded
+        self.content = {"total": 50<<30, "used":1024}
+        dialog.request_quota_info()
+        # ensure the plan label says "Paid" and the upgrade button is not there
+        self.assertEqual(dialog.plan_label.get_text(), 'Paid')
+        self.assertFalse(dialog.upgrade_link.get_visible())
         dialog.destroy()
 
     def test_toggle_bookmarks(self):
@@ -287,6 +388,20 @@
         self.mocker.replay()
         dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
         self.assertTrue(dialog is not None)
+        def files_toggled(checkbutton):
+            enabled = checkbutton.get_active()
+            if enabled:
+                dialog.music_check.set_sensitive(True)
+            else:
+                dialog.music_check.set_sensitive(False)
+
+        def music_toggled(checkbutton):
+            pass
+
+        dialog.files_check_toggled = files_toggled
+        dialog.music_check_toggled = music_toggled
+        dialog.connect_file_sync_callbacks()
+
         dialog.files_check.set_active(False)
         self.assertFalse(dialog.files_check.get_active())
         self.assertFalse(dialog.music_check.props.sensitive)
@@ -324,12 +439,13 @@
 
         d = defer.Deferred()
 
-        login = self.u1prefs.UbuntuoneLoginHandler()
+        login = self.u1prefs.UbuntuoneLoginHandler(dialog=None)
         login.got_newcredentials = got_new_creds
         login.got_authdenied = got_auth_denied
         login.got_oautherror = got_oauth_error
         login.got_dbus_error = got_dbus_error
         login.register_signal_handlers()
-        login.do_login_check()
+        self.u1prefs.do_login_request(bus=self.bus,
+                                      error_handler=got_dbus_error)
 
         return d

=== modified file 'tests/test_preferences.pyc'
Binary files tests/test_preferences.pyc	2010-03-10 23:36:53 +0000 and tests/test_preferences.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/u1sync/__init__.pyc'
Binary files tests/u1sync/__init__.pyc	2010-03-10 23:36:53 +0000 and tests/u1sync/__init__.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/u1sync/test_init.pyc'
Binary files tests/u1sync/test_init.pyc	2010-03-10 23:36:53 +0000 and tests/u1sync/test_init.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'tests/u1sync/test_merge.pyc'
Binary files tests/u1sync/test_merge.pyc	2010-03-10 23:36:53 +0000 and tests/u1sync/test_merge.pyc	2010-03-31 23:55:45 +0000 differ
=== modified file 'ubuntuone/oauthdesktop/key_acls.py'
--- ubuntuone/oauthdesktop/key_acls.py	2009-06-30 12:00:00 +0000
+++ ubuntuone/oauthdesktop/key_acls.py	2010-03-31 23:55:45 +0000
@@ -36,7 +36,7 @@
     if use_source_tree_folder:
         source_tree_folder = os.path.join(
              os.path.split(__file__)[0], 
-             "../../../oauth_registration.d")
+             "../../data/oauth_registration.d")
         if os.path.isdir(source_tree_folder):
             return os.path.join(source_tree_folder, "..")
     

=== modified file 'ubuntuone/oauthdesktop/main.py'
--- ubuntuone/oauthdesktop/main.py	2010-02-17 23:51:29 +0000
+++ ubuntuone/oauthdesktop/main.py	2010-03-31 23:55:45 +0000
@@ -25,13 +25,12 @@
 signal so they can retrieve the new token.