Merge lp:~mardy/signon-ui/unity-crash-1673984 into lp:signon-ui

Proposed by Alberto Mardegan on 2017-03-20
Status: Merged
Approved by: David Barth on 2017-03-20
Approved revision: 148
Merged at revision: 148
Proposed branch: lp:~mardy/signon-ui/unity-crash-1673984
Merge into: lp:signon-ui
Diff against target: 12 lines (+1/-1)
1 file modified
src/request.cpp (+1/-1)
To merge this branch: bzr merge lp:~mardy/signon-ui/unity-crash-1673984
Reviewer Review Type Date Requested Status
Online Accounts 2017-03-20 Pending
Review via email: mp+320309@code.launchpad.net

Commit message

Update for Unity7 session renaming.

Description of the change

Update for Unity7 session renaming.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/request.cpp'
2--- src/request.cpp 2016-11-02 13:14:54 +0000
3+++ src/request.cpp 2017-03-20 09:02:21 +0000
4@@ -266,7 +266,7 @@
5 #ifdef USE_UBUNTU_WEB_VIEW
6 TRACE() << "Platform:" << QGuiApplication::platformName();
7 if (QGuiApplication::platformName().startsWith("ubuntu") ||
8- qgetenv("XDG_CURRENT_DESKTOP") == QByteArray("Unity") ||
9+ qgetenv("XDG_CURRENT_DESKTOP").startsWith("Unity") ||
10 qgetenv("SSOUI_USE_UBUNTU_WEB_VIEW") == QByteArray("1")) {
11 return new UbuntuBrowserRequest(connection, message,
12 parameters, parent);

Subscribers

People subscribed via source and target branches

to all changes: