git.iko.soy/unity8
on xenial help sign in
address review issues

remove debug, use local variables, nuke unneeded keyboard quirk

commit7807f8fdba4ce6f4a7f9304b735410ac777c1ced authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 1 Dec 2015, 23:37 (11 years ago) parentb3237e6
3 files changed+6−13
compare with xenial
unifiedsplit
plugins/Unity/Indicators/indicatorsmanager.cpp−4 plugins/Unity/Platform/platform.cpp+6−7 plugins/Unity/Platform/platform.h−2
plugins/Unity/Indicators/indicatorsmanager.cpp−4
@@ -116,10 +116,6 @@ void IndicatorsManager::loadFile(const QFileInfo& file_info)
116116 QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
117117 const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
118118
119− if (m_platform.isPC() && name == "indicator-keyboard") {
120− return; // convergence: skip this indicator until it works in Mir
121− }
122−
123119 auto iter = m_indicatorsData.constFind(name);
124120 if (iter != m_indicatorsData.constEnd())
125121 {
plugins/Unity/Platform/platform.cpp+6−7
@@ -27,15 +27,14 @@ Platform::Platform(QObject *parent)
2727
2828void Platform::init()
2929{
30− m_iface = new QDBusInterface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",
31− QDBusConnection::systemBus(), this);
32− m_seatIface = new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",
33− QDBusConnection::systemBus(), this);
30+ QDBusInterface iface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",
31+ QDBusConnection::systemBus(), this);
32+ QDBusInterface seatIface("org.freedesktop.login1", "/org/freedesktop/login1/seat/self", "org.freedesktop.login1.Seat",
33+ QDBusConnection::systemBus(), this);
3434
35− m_chassis = m_iface->property("Chassis").toString();
35+ m_chassis = iface.property("Chassis").toString();
3636 m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");
37− m_isMultiSession = m_seatIface->property("CanMultiSession").toBool() && m_seatIface->property("CanGraphical").toBool();
38− qDebug() << "Unity8 platform initialized, form factor" << m_chassis << ", multisession capable:" << m_isMultiSession;
37+ m_isMultiSession = seatIface.property("CanMultiSession").toBool() && seatIface.property("CanGraphical").toBool();
3938}
4039
4140QString Platform::chassis() const
plugins/Unity/Platform/platform.h−2
@@ -56,8 +56,6 @@ private Q_SLOTS:
5656 void init();
5757
5858private:
59− QDBusInterface *m_iface = nullptr;
60− QDBusInterface *m_seatIface = nullptr;
6159 QString m_chassis;
6260 bool m_isPC;
6361 bool m_isMultiSession;