← Back to branch summary

~verterok/ubuntuone-client/fix-597870-stable

« back to all changes in this revision

Viewing changes to bin/ubuntuone-preferences

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2010-06-07 17:28:04 UTC
  • mfrom: (512.4.1 fix-576263-stable)
  • Revision ID: dobey@wayofthemonkey.com-20100607172804-joerzmp02pupodb9
Avoid opening the error dialog when getting devices list

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubuntuone-preferences
332
332
        """
333
333
        Parse the list of devices, and hook up list_devices if it worked.
334
334
        """
335
 
        is_error = False
336
335
        error = None
337
336
        if result and isinstance(result, list):
338
337
            self.devices = result
339
338
        elif isinstance(result, dict):
340
339
            error = result.get('error', None)
341
340
            if not error and result.get('status', None):
342
 
                is_error = True
343
341
                error = result.get('reason', None)
344
342
            else:
345
 
                is_error = True
 
343
                error = "Invalid response getting devices list."
346
344
        else:
347
345
            error = "Got empty result for devices list."
348
 
            is_error = True
349
346
 
350
 
        if is_error:
351
 
            self.devices = None
352
 
            self.error(error)
 
347
        if error:
 
348
            self.devices = []
 
349
            logger.error(error)
353
350
 
354
351
        gobject.idle_add(self.list_devices)
355
352