Merge lp:~ralsina/ubuntu-sso-client/cross-platform into lp:ubuntu-sso-client

[Roberto Alsina]

 - Only import DBus on Linux (LP: #956304).

 - Only import DBus on Linux (LP: #956304).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~ralsina/ubuntu-sso-client/cross-platform]

915. By Roberto Alsina on 2012-03-15

fix lint

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'bin/ubuntu-sso-login-qt'
--- bin/ubuntu-sso-login-qt	2012-02-13 15:43:59 +0000
+++ bin/ubuntu-sso-login-qt	2012-03-15 20:20:42 +0000
@@ -15,16 +15,19 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Start the sso GTK UI."""
+"""Start the sso Qt UI."""
 
 # Invalid name "ubuntu-sso-login-qt", pylint: disable=C0103
 # Access to a protected member, pylint: disable=W0212
 
+import sys
+
 from ubuntu_sso.qt.main import main
 from ubuntu_sso.utils.ui import parse_args
 
-from dbus.mainloop.qt import DBusQtMainLoop
-DBusQtMainLoop(set_as_default=True)
+if sys.platform.startswith('linux'):
+    from dbus.mainloop.qt import DBusQtMainLoop
+    DBusQtMainLoop(set_as_default=True)
 
 
 if __name__ == "__main__":