← Back to branch summary

~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick

« back to all changes in this revision

Viewing changes to bin/ubuntuone-preferences

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2010-09-08 13:26:04 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20100908132604-u9m5x0vib7k3cyxw
Tags: 1.4.0-0ubuntu1
https://launchpad.net/bugs/625525
https://launchpad.net/bugs/624212
https://launchpad.net/bugs/621924
https://launchpad.net/bugs/614047
https://launchpad.net/bugs/628852
https://launchpad.net/bugs/614055
https://launchpad.net/bugs/632502
https://launchpad.net/bugs/619958
* New upstream release:
  - Fix crash when disabling UDFs (Rodrigo Moya) (LP: #625525)
  - Only show one question dialog when disabling UDFs (Rodrigo Moya)
    (LP: #624212)
  - Cancelled uploads don't survive forever now (Facundo Batista)
  - Remove ancient ubuntuone/oauthdesktop reference from Makefile.am
    (Rodney Dawes)
  - Fix dbus interface get_metadata methods to use the realpath
    (Guillermo Gonzalez) (LP: #621924)
  - Make dbus interface handle WaitForCondition in waiting_content properly
    (and any other 'empty' commands) (Guillermo Gonzalez)
  - Some code cleanup when analysing code for a bug that was already fixed
    (Facundo Batista)
  - Some code cleanups in AQ (Facundo Batista)
  - Draw a separator between recently used contacts and the rest
    (Rodrigo Moya) (LP: #614047)
  - Use correct app name when clearing tokens in ubuntuone-preferences
    (Rodrigo Moya) (LP: #628852)
  - When user cancels deletion of UDF, keep the toggle button's status
    (Rodrigo Moya)
  - When the contact has no name, use whatever is available (Rodrigo Moya)
    (LP: #614055)
  - Remove old oauthdesktop references (Natalia Bidart) (LP: #632502)
  - Fix u1sdtool --rescan_from_scratch args parsing to support VOLUME_ID=""
    (Guillermo Gonzalez) (LP: #619958)
* debian/python-ubuntuone-client.install:
  - Remove oauthdesktop files from installation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubuntuone-preferences
34
34
from threading import Thread
35
35
from oauth import oauth
36
36
 
37
 
from ubuntu_sso import DBUS_IFACE_AUTH_NAME, DBUS_IFACE_CRED_NAME, DBUS_CRED_PATH
 
37
from ubuntu_sso import DBUS_BUS_NAME, DBUS_IFACE_CRED_NAME, DBUS_CRED_PATH
38
38
from ubuntuone import clientdefs
39
39
from ubuntuone.syncdaemon.tools import SyncDaemonTool
40
40
from ubuntuone.api.restclient import RestClient
103
103
def do_login_request(bus, error_handler):
104
104
    """Make a login request to the login handling daemon."""
105
105
    try:
106
 
        client = bus.get_object(DBUS_IFACE_AUTH_NAME,
 
106
        client = bus.get_object(DBUS_BUS_NAME,
107
107
                                DBUS_CRED_PATH,
108
108
                                follow_name_owner_changes=True)
109
109
        iface = dbus.Interface(client, DBUS_IFACE_CRED_NAME)
443
443
                                             DBUS_CRED_PATH,
444
444
                                             follow_name_owner_changes=True)
445
445
                iface = dbus.Interface(client, DBUS_IFACE_CRED_NAME)
446
 
                iface.clear_token('ubuntuone',
 
446
                iface.clear_token(clientdefs.APP_NAME,
447
447
                                  reply_handler=local_removal_cb,
448
448
                                  error_handler=self.error)
449
449
            except DBusException, e: