Ubuntu Single Sign On Client

Merge lp:~nataliabidart/ubuntu-sso-client/use-qtmainloop-by-default into lp:ubuntu-sso-client

  1. use-qtmainloop-by-default
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 875
Merged at revision: 876
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/use-qtmainloop-by-default
Merge into: lp:ubuntu-sso-client
Diff against target: 23 lines (+2/-3)
1 file modified
ubuntu_sso/main/linux.py (+2/-3)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/use-qtmainloop-by-default
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+93472@code.launchpad.net

Commit message

- Try to load the qt main/ implementation when possible, if not default
  to the glib (LP: #933534).

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/main/linux.py'
2--- ubuntu_sso/main/linux.py 2012-02-11 01:51:57 +0000
3+++ ubuntu_sso/main/linux.py 2012-02-16 18:15:28 +0000
4@@ -25,7 +25,6 @@
5
6 """
7
8-import os
9 import signal
10
11 import dbus
12@@ -439,10 +438,10 @@
13 return defer.succeed(result)
14
15
16-if os.environ.get('USE_QT_MAINLOOP'):
17+try:
18 from ubuntu_sso.main import qt
19 source = qt
20-else:
21+except ImportError: # no PyQt4.QtCore in the system
22 from ubuntu_sso.main import glib
23 source = glib
24

Subscribers

People subscribed via source and target branches