9d4200b · unity8 · git.iko.soy

debian/control+1

compare with xenial

unifiedsplit

@@ -107,6 +107,7 @@ Description: Unity 8 shell

107Package: unity8-greeter

108Architecture: any

109Depends: dbus-x11,

110+ libglib2.0-bin,

110 lightdm,

111 lightdm,

111 ubuntu-touch-session,

112 ubuntu-touch-session,

112 unity8 (>= ${source:Version}),

113 unity8 (>= ${source:Version}),

plugins/AccountsService/AccountsService.cpp−1

@@ -24,7 +24,6 @@

24AccountsService::AccountsService(QObject* parent)

25 : QObject(parent),

26 m_service(new AccountsServiceDBusAdaptor(this)),

27− m_user(qgetenv("USER")),

28 m_demoEdges(false),

27 m_demoEdges(false),

29 m_statsWelcomeScreen(false)

28 m_statsWelcomeScreen(false)

30{

29{

plugins/LightDM/URLDispatcher.cpp+2−8

@@ -17,8 +17,6 @@

17#include "URLDispatcher.h"

18

19#include <QDBusConnection>

20−#include <QProcess>

21−#include <unistd.h>

22

20

23class URLDispatcherInterface : public QObject

21class URLDispatcherInterface : public QObject

24{

22{

@@ -29,20 +27,16 @@ public:

29 explicit URLDispatcherInterface(URLDispatcher *parent);

27 explicit URLDispatcherInterface(URLDispatcher *parent);

30

28

31 Q_SCRIPTABLE void DispatchURL(const QString &url);

29 Q_SCRIPTABLE void DispatchURL(const QString &url);

32−

33−private:

34− URLDispatcher *m_parent;

35};

30};

36

31

37URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)

32URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)

38− : QObject(parent),

33+ : QObject(parent)

39− m_parent(parent)

40{

34{

41}

35}

42

36

43void URLDispatcherInterface::DispatchURL(const QString &url)

37void URLDispatcherInterface::DispatchURL(const QString &url)

44{

38{

45− Q_EMIT m_parent->dispatchURL(url);

39+ Q_EMIT static_cast<URLDispatcher *>(parent())->dispatchURL(url);

46}

40}

47

41

48URLDispatcher::URLDispatcher(QObject *parent)

42URLDispatcher::URLDispatcher(QObject *parent)

plugins/SessionBroadcast/SessionBroadcast.cpp+1−2

@@ -22,8 +22,7 @@

22#include <QDBusInterface>

23

24SessionBroadcast::SessionBroadcast(QObject* parent)

25− : QObject(parent),

25+ : QObject(parent)

26− m_broadcaster(NULL)

27{

26{

28 auto connection = QDBusConnection::SM_BUSNAME();

27 auto connection = QDBusConnection::SM_BUSNAME();

29 auto interface = connection.interface();

28 auto interface = connection.interface();

plugins/SessionManager/plugin.cpp+1−1

@@ -19,7 +19,7 @@

19

20#include "plugin.h"

21#include "SessionManager.h"

22−#include <QtQml>

22+#include <QtQml/qqml.h>

23

24static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25{

tests/autopilot/unity8/shell/tests/test_greeter.py.THISdeleted−38

@@ -1,38 +0,0 @@

1−# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2−#

3−# Unity Autopilot Test Suite

5−#

6−# This program is free software: you can redistribute it and/or modify

7−# it under the terms of the GNU General Public License as published by

8−# the Free Software Foundation, either version 3 of the License, or

9−# (at your option) any later version.

10−#

11−# This program is distributed in the hope that it will be useful,

12−# but WITHOUT ANY WARRANTY; without even the implied warranty of

13−# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14−# GNU General Public License for more details.

15−#

16−# You should have received a copy of the GNU General Public License

17−# along with this program. If not, see <http://www.gnu.org/licenses/>.

18−#

19−

20−from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

21−from autopilot.introspection.types import Rectangle

22−from testtools.matchers import Equals

23−

24−class TestGreeter(UnityTestCase):

25−

26− """Tests the Shell Greeter."""

27−

28− scenarios = _get_device_emulation_scenarios()

29−

30− def test_greeter_background(self):

31− """Test that the background of the greeter is placed correctly

32−

33− """

34− self.launch_greeter()

35− greeter_background = self.main_window.get_greeter_background()

36− winRect = Rectangle(self.main_window.x, self.main_window.y,

37− self.main_window.width, self.main_window.height)

38− self.assertThat(greeter_background.globalRect, Equals(winRect))

tests/mocks/SessionManager/plugin.cpp+1−2

@@ -18,8 +18,7 @@

18

19#include "plugin.h"

20#include "SessionManager.h"

21−

22−#include <QtQml>

21+#include <QtQml/qqml.h>

23

22

24static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

23static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25{

24{