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

« back to all changes in this revision

Viewing changes to bin/ubuntu-sso-login-qt

  • Committer: Tarmac
  • Author(s): Diego Sarmentero, Roberto Alsina, Natalia B. Bidart, manuel.delapena at canonical, Manuel de la Pena
  • Date: 2012-03-27 19:33:27 UTC
  • mfrom: (831.1.2 stable-3-0-update-2.99.91.1)
  • Revision ID: tarmac-20120327193327-rgwi1z1cbfxxrx9d
Tags: release-2_99_91_1
[ Diego Sarmentero <diego.sarmentero@canonical.com> ]
  - Converting to unicode some data returned by webclient in
    QByteArray format (LP: #961315).
  - Adding ubuntu_sso.qt.main module to the setup script (LP: #965377).
  - Fixed the backend getting stuck installing the qtreactor before
    the qt process is executed and running the application in the
    twisted process (This fix affects only Windows OS) (LP: #961511).

[ Roberto Alsina <roberto.alsina@canonical.com> ]
   - Forced white background (LP: #961346).

[ Manuel de la Pena <manuel.delapena@canonical.com> ]
  - Fixed dialog on window by using show so that the QEventLoop does
    not block the execution of the main loop of the reactor which did
    not allow the deferreds to be fired (LP: #960481).

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
# Access to a protected member, pylint: disable=W0212
22
22
 
23
23
import sys
 
24
if sys.platform == 'win32':
 
25
    import qt4reactor
 
26
    qt4reactor.install()
24
27
 
25
28
from ubuntu_sso.qt.main import main
26
29
from ubuntu_sso.utils.ui import parse_args
27
30
 
28
 
if sys.platform.startswith('linux'):
29
 
    from dbus.mainloop.qt import DBusQtMainLoop
30
 
    DBusQtMainLoop(set_as_default=True)
31
 
 
32
31
 
33
32
if __name__ == "__main__":
34
33
    args = parse_args()