← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-client/oneiric

« back to all changes in this revision

Viewing changes to bin/ubuntuone-preferences

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2010-06-08 17:31:18 UTC
  • mto: This revision was merged to the branch mainline in revision 31.
  • Revision ID: james.westby@ubuntu.com-20100608173118-o8s897ll11rtne99
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubuntuone-preferences
301
301
        """
302
302
        logger.error(msg)
303
303
        dialog = gtk.MessageDialog(self.get_toplevel(),
304
 
                                   gtk.DIALOG_DESTROY_WITH_PARENT | gtk.MODAL,
 
304
                                   gtk.DIALOG_DESTROY_WITH_PARENT | 
 
305
                                   gtk.DIALOG_MODAL,
305
306
                                   gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE,
306
307
                                   'Error')
307
308
        dialog.format_secondary_text(str(msg))
308
 
        dialog.run()
 
309
        try:
 
310
            dialog.run()
 
311
        finally:
 
312
            dialog.destroy()
309
313
        while gtk.events_pending():
310
314
            gtk.main_iteration()
311
315
 
328
332
        """
329
333
        Parse the list of devices, and hook up list_devices if it worked.
330
334
        """
331
 
        is_error = False
332
335
        error = None
333
336
        if result and isinstance(result, list):
334
337
            self.devices = result
335
338
        elif isinstance(result, dict):
336
339
            error = result.get('error', None)
337
340
            if not error and result.get('status', None):
338
 
                is_error = True
339
341
                error = result.get('reason', None)
340
342
            else:
341
 
                is_error = True
 
343
                error = "Invalid response getting devices list."
342
344
        else:
343
345
            error = "Got empty result for devices list."
344
 
            is_error = True
345
346
 
346
 
        if is_error:
347
 
            self.devices = None
348
 
            self.error(error)
 
347
        if error:
 
348
            self.devices = []
 
349
            logger.error(error)
349
350
 
350
351
        gobject.idle_add(self.list_devices)
351
352
 
798
799
            if self.ums_id:
799
800
                self.music_check.set_sensitive(True)
800
801
                if self.music_check.get_active():
801
 
                    self.__music_check_toggled(self.music_check)
 
802
                    self.music_check_toggled(self.music_check)
802
803
        else:
803
804
            self.sdtool.quit().addCallback(
804
805
                lambda _: self.devices.list_devices())