~mvo/ubuntu-sso-client/strawman-lp711413

« back to all changes in this revision

Viewing changes to bin/ubuntu-login

  • Committer: natalia.bidart at canonical
  • Date: 2010-06-09 18:23:27 UTC
  • mfrom: (533.1.4 rename)
  • Revision ID: natalia.bidart@canonical.com-20100609182327-kmd0rjjb1f0eojhu
Renaming modules and Dbus service to make them more generic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
 
3
 
# ubuntuone-login - Client side log-in utility for Ubuntu One
 
3
# ubuntu-login - Client side log-in utility for Ubuntu One
4
4
#
5
5
# Author: Rodney Dawes <rodney.dawes@canonical.com>
6
6
#
24
24
import pango
25
25
import sys
26
26
import gettext
27
 
#from ubuntuone import clientdefs
 
27
#from ubuntu import clientdefs
28
28
 
29
29
import dbus.service
30
30
 
31
31
from dbus.mainloop.glib import DBusGMainLoop
32
 
from ubuntuone.oauthdesktop.main import Login
33
 
 
34
 
from ubuntuone.oauthdesktop.logger import setupLogging
35
 
logger = setupLogging("ubuntuone-login")
 
32
 
 
33
from ubuntu.sso import DBUS_IFACE_AUTH_NAME
 
34
from ubuntu.sso.main import Login
 
35
 
 
36
from ubuntu.sso.logger import setupLogging
 
37
logger = setupLogging("ubuntu-login")
36
38
 
37
39
DBusGMainLoop(set_as_default=True)
38
40
 
39
41
_ = gettext.gettext
40
42
ngettext = gettext.ngettext
41
43
 
42
 
DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
43
 
 
44
44
OAUTH_REALM = "https://ubuntuone.com"
45
45
OAUTH_CONSUMER = "ubuntuone"
46
46
 
64
64
        """Initializes the child threads and dbus monitor."""
65
65
        gtk.rc_parse_string(RCSTYLE)
66
66
 
67
 
        #logger.info(_("Starting Ubuntu One login manager version %s") %
68
 
        #            clientdefs.VERSION)
 
67
        logger.info(_("Starting Ubuntu SSO login manager"))
69
68
 
70
69
        self.__bus = dbus.SessionBus()
71
70
 
121
120
                                buttons=(gtk.STOCK_CLOSE,
122
121
                                         gtk.RESPONSE_CLOSE))
123
122
            dialog.set_default_response(gtk.RESPONSE_CLOSE)
124
 
            dialog.set_icon_name("ubuntuone-client")
 
123
            dialog.set_icon_name("ubuntu-sso-client")
125
124
 
126
125
            area = dialog.get_content_area()
127
126