Merge lp:~dobey/ubuntuone-client/fix-576263-stable into lp:ubuntuone-client/stable-1-2

[dobey]

Avoid opening the error dialog when getting devices list

[Natalia Bidart (nataliabidart)]

Tests must be provided for this feature.

If this is a backport from trunk, the tests should be backported as well. If there are no tests in trunk for this change, those should be added and then backported.

review: Needs Fixing

[dobey (dobey)]

Bug for needing tests: https://bugs.edge.launchpad.net/ubuntuone-client/+bug/589896

[Natalia Bidart (nataliabidart)]

review: Approve

[Roman Yepishev (rye)]

Dialog does not appear anymore.
However I will file a bug regarding the actions that should be done by the software if user removes all tokens via the web interface.

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-04-21 20:33:11 +0000
+++ bin/ubuntuone-preferences	2010-05-28 14:34:30 +0000
@@ -332,24 +332,21 @@
         """
         Parse the list of devices, and hook up list_devices if it worked.
         """
-        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
+                error = "Invalid response getting devices list."
         else:
             error = "Got empty result for devices list."
-            is_error = True
 
-        if is_error:
-            self.devices = None
-            self.error(error)
+        if error:
+            self.devices = []
+            logger.error(error)
 
         gobject.idle_add(self.list_devices)