1
=== modified file 'bin/ubuntuone-preferences'
2
--- bin/ubuntuone-preferences	2010-12-10 19:41:58 +0000
3
+++ bin/ubuntuone-preferences	2011-01-05 20:47:27 +0000
4
@@ -66,7 +66,8 @@
5
66
dcouch = None
66
dcouch = None
6
67
# Try importing the Ubuntu One desktopcouch enablement api
67
# Try importing the Ubuntu One desktopcouch enablement api
7
68
try:
68
try:
9
69
    from desktopcouch.replication_services import ubuntuone as dcouch
69
    from desktopcouch.application.replication_services import (
10
70
        ubuntuone as dcouch)
11
70
except ImportError:
71
except ImportError:
12
71
    logger.error("DesktopCouch replication API not found")
72
    logger.error("DesktopCouch replication API not found")
13
72
73
14
@@ -709,9 +710,14 @@
15
709
    def connect_desktopcouch_exclusion(self):
710
    def connect_desktopcouch_exclusion(self):
16
710
        """Hook up to desktopcouch enablement API, or disable the UI."""
711
        """Hook up to desktopcouch enablement API, or disable the UI."""
17
711
        # Hook up to desktopcouch, or die trying
712
        # Hook up to desktopcouch, or die trying
19
712
        if dcouch:
713
        try:
20
714
            if not dcouch:
21
715
                raise ValueError('Replication service not available.')
22
716
23
717
            # Check bindwood availability
24
713
            Thread(target=self.__check_for_bindwood).start()
718
            Thread(target=self.__check_for_bindwood).start()
25
714
719
26
720
            # Get the exclusion settings
27
715
            self.dcouch = dcouch.ReplicationExclusion()
721
            self.dcouch = dcouch.ReplicationExclusion()
28
716
            exclusions = self.dcouch.all_exclusions()
722
            exclusions = self.dcouch.all_exclusions()
29
717
            for check in [self.bookmarks_check,
723
            for check in [self.bookmarks_check,
30
@@ -721,10 +727,13 @@
31
721
                    check.set_active(False)
727
                    check.set_active(False)
32
722
                else:
728
                else:
33
723
                    check.set_active(True)
729
                    check.set_active(True)
38
724
        else:
730
        except ValueError, e:
39
725
            self.bookmarks_check.set_sensitive(False)
731
            # Replication is not avaialble, so disable the UI
40
726
            self.abook_check.set_sensitive(False)
732
            for check in [self.bookmarks_check,
41
727
            self.gwib_check.set_sensitive(False)
733
                          self.abook_check,
42
734
                          self.gwib_check]:
43
735
                check.set_sensitive(False)
44
736
            logger.warning(e)
45
728
737
46
729
    def toggle_db_sync(self, dbname, disable=False):
738
    def toggle_db_sync(self, dbname, disable=False):
47
730
        """
739
        """
Reviewer	Review Type	Date Requested	Status
Natalia Bidart (community)			Approve on 2011-01-05
Roman Yepishev (community)	fieldtest	2010-12-16	Approve on 2010-12-17
Review via email: mp+43976@code.launchpad.net