7807f8f · unity8 · git.iko.soy

plugins/Unity/Indicators/indicatorsmanager.cpp−4

compare with xenial

unifiedsplit

@@ -116,10 +116,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)

116 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);

117 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();

118

119− if (m_platform.isPC() && name == "indicator-keyboard") {

120− return; // convergence: skip this indicator until it works in Mir

121− }

122−

123 auto iter = m_indicatorsData.constFind(name);

119 auto iter = m_indicatorsData.constFind(name);

124 if (iter != m_indicatorsData.constEnd())

120 if (iter != m_indicatorsData.constEnd())

125 {

121 {

plugins/Unity/Platform/platform.cpp+6−7

@@ -27,15 +27,14 @@ Platform::Platform(QObject *parent)

27

28void Platform::init()

29{

30− m_iface = new QDBusInterface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",

30+ QDBusInterface iface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",

31− QDBusConnection::systemBus(), this);

31+ QDBusConnection::systemBus(), this);

32− m_seatIface = new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",

32+ QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",

33− QDBusConnection::systemBus(), this);

33+ QDBusConnection::systemBus(), this);

34

35− m_chassis = m_iface->property("Chassis").toString();

35+ m_chassis = iface.property("Chassis").toString();

36 m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");

37− m_isMultiSession = m_seatIface->property("CanMultiSession").toBool() && m_seatIface->property("CanGraphical").toBool();

37+ m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();

38− qDebug() << "Unity8 platform initialized, form factor" << m_chassis << ", multisession capable:" << m_isMultiSession;

39}

38}

40

39

41QString Platform::chassis() const

40QString Platform::chassis() const

plugins/Unity/Platform/platform.h−2

@@ -56,8 +56,6 @@ private Q_SLOTS:

56 void init();

57

58private:

59− QDBusInterface *m_iface = nullptr;

60− QDBusInterface *m_seatIface = nullptr;

61 QString m_chassis;

59 QString m_chassis;

62 bool m_isPC;

60 bool m_isPC;

63 bool m_isMultiSession;

61 bool m_isMultiSession;