git.iko.soy/unity8
on xenial help sign in
Address review comments
c488c56Michael Terry
plugins/LightDM/Greeter.cpp+1−1
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
plugins/LightDM/Greeter.h+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2012,2013,2015 Canonical, Ltd.
2+ * Copyright (C) 2012-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
plugins/LightDM/SessionsModel.h+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
plugins/LightDM/UsersModel.cpp+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
qml/Shell.qml+1−1
@@ -607,7 +607,7 @@ StyledItem {
607 readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
607 readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
608 ? MirFocusController.focusedSurface.state === Mir.FullscreenState
608 ? MirFocusController.focusedSurface.state === Mir.FullscreenState
609 : false
609 : false
610− fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
610+ fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress === 0)
611 || greeter.hasLockedApp
611 || greeter.hasLockedApp
612 locked: greeter && greeter.active
612 locked: greeter && greeter.active
613 }
613 }
tests/mocks/liblightdm/MockController.cpp+1
@@ -48,6 +48,7 @@ MockController::MockController(QObject *parent)
48
48
49MockController::~MockController()
49MockController::~MockController()
50{
50{
51+ m_instance = nullptr;
51}
52}
52
53
53MockController *MockController::instance()
54MockController *MockController::instance()
tests/mocks/liblightdm/MockSessionsModel.cpp+4−4
@@ -44,10 +44,10 @@ SessionsModel::SessionsModel(QObject* parent)
44 d->roleNames[KeyRole] = "key";
44 d->roleNames[KeyRole] = "key";
45 d->roleNames[TypeRole] = "type";
45 d->roleNames[TypeRole] = "type";
46
46
47− connect(MockController::instance(), SIGNAL(sessionModeChanged()),
47+ connect(MockController::instance(), &MockController::sessionModeChanged,
48− this, SLOT(resetEntries()));
48+ this, &SessionsModel::resetEntries);
49− connect(MockController::instance(), SIGNAL(numSessionsChanged()),
49+ connect(MockController::instance(), &MockController::numSessionsChanged,
50− this, SLOT(resetEntries()));
50+ this, &SessionsModel::resetEntries);
51 resetEntries();
51 resetEntries();
52}
52}
53
53