Ubuntu Single Sign On Client

Merge lp:~ralsina/ubuntu-sso-client/fix-958884 into lp:ubuntu-sso-client

  1. fix-958884
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Natalia Bidart
Approved revision: 925
Merged at revision: 929
Proposed branch: lp:~ralsina/ubuntu-sso-client/fix-958884
Merge into: lp:ubuntu-sso-client
Diff against target: 18 lines (+6/-3)
1 file modified
bin/ubuntu-sso-proxy-creds-qt (+6/-3)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/fix-958884
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+98118@code.launchpad.net

Commit message

- Made the ubuntu-sso-proxy-creds script crossplatform (LP: #958884).

Description of the change

 - Made the ubuntu-sso-proxy-creds script crossplatform (LP: 958884).

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Easy but needed change!

review: Approve
lp:~ralsina/ubuntu-sso-client/fix-958884 updated
925. By Roberto Alsina

oops

Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntu-sso-proxy-creds-qt'
2--- bin/ubuntu-sso-proxy-creds-qt 2012-02-24 13:07:10 +0000
3+++ bin/ubuntu-sso-proxy-creds-qt 2012-03-18 23:35:23 +0000
4@@ -19,9 +19,12 @@
5
6 # Invalid name, pylint: disable=C0103
7
8-# set the dbus main loop to be used
9-from dbus.mainloop.qt import DBusQtMainLoop
10-DBusQtMainLoop(set_as_default=True)
11+import sys
12+
13+if sys.platform.startswith('linux'):
14+ # set the dbus main loop to be used
15+ from dbus.mainloop.qt import DBusQtMainLoop
16+ DBusQtMainLoop(set_as_default=True)
17
18 from ubuntu_sso.qt.proxy_dialog import main
19

Subscribers

People subscribed via source and target branches