Ubuntu Single Sign On Client

Merge lp:~ralsina/ubuntu-sso-client/fix_810096 into lp:ubuntu-sso-client

  1. fix_810096
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 737
Merged at revision: 736
Proposed branch: lp:~ralsina/ubuntu-sso-client/fix_810096
Merge into: lp:ubuntu-sso-client
Diff against target: 22 lines (+3/-2)
1 file modified
ubuntu_sso/main/windows.py (+3/-2)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/fix_810096
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+67878@code.launchpad.net

Commit message

Expose the ui_module parameter.

Description of the change

Expose the ui_module parameter.

To post a comment you must log in.
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 'ubuntu_sso/main/windows.py'
2--- ubuntu_sso/main/windows.py 2011-07-11 16:56:01 +0000
3+++ ubuntu_sso/main/windows.py 2011-07-13 19:36:01 +0000
4@@ -332,7 +332,8 @@
5
6 def login_or_register_to_get_credentials(self, app_name,
7 terms_and_conditions_url,
8- help_text, window_id):
9+ help_text, window_id,
10+ ui_module='ubuntu_sso.qt.gui'):
11 """Get credentials if found else prompt GUI to login or register.
12
13 'app_name' will be displayed in the GUI.
14@@ -349,7 +350,7 @@
15 self.emit_credentials_found,
16 self._process_error,
17 self.emit_authorization_denied,
18- ui_module='ubuntu_sso.qt.gui')
19+ ui_module=ui_module)
20
21 def login_to_get_credentials(self, app_name, help_text, window_id):
22 """Get credentials if found else prompt GUI just to login

Subscribers

People subscribed via source and target branches