9c21cc5 · unity8 · git.iko.soy

git.iko.soy/unity8

Handle chassis cases that are not documented

9c21cc5Pete Woods10 years ago

plugins/Unity/Platform/platform.cpp+12−5

@@ -33,13 +33,20 @@ void Platform::init()

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

34 QDBusConnection::systemBus(), this);

36− // From the docs at https://www.freedesktop.org/wiki/Software/systemd/hostnamed/

36+ // From the source at https://cgit.freedesktop.org/systemd/systemd/tree/src/hostname/hostnamed.c#n130

37− // the options are "desktop", "laptop", "server", "tablet", "handset", as well

37+ // "vm\0"

38− // as the special chassis types "vm" and "container".

38+ // "container\0"

39+ // "desktop\0"

40+ // "laptop\0"

41+ // "server\0"

42+ // "tablet\0"

43+ // "handset\0"

44+ // "watch\0"

45+ // "embedded\0",

39 m_chassis = iface.property("Chassis").toString();

46 m_chassis = iface.property("Chassis").toString();

41− // A PC is not a phone or tablet.

48+ // A PC is not a handset, tablet or watch.

42− m_isPC = !QSet<QString>{"handset", "tablet"}.contains(m_chassis);

49+ m_isPC = !QSet<QString>{"handset", "tablet", "watch"}.contains(m_chassis);

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

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

44}

51}

tests/plugins/Unity/Platform/platformtest.cpp+4−2

@@ -86,13 +86,15 @@ private Q_SLOTS:

86 QTest::addColumn<QString>("chassis");

87 QTest::addColumn<bool>("result");

89+ QTest::newRow("vm") << "vm" << true;

90+ QTest::newRow("container") << "container" << true;

89 QTest::newRow("desktop") << "desktop" << true;

91 QTest::newRow("desktop") << "desktop" << true;

90 QTest::newRow("laptop") << "laptop" << true;

92 QTest::newRow("laptop") << "laptop" << true;

91 QTest::newRow("server") << "server" << true;

93 QTest::newRow("server") << "server" << true;

92 QTest::newRow("tablet") << "tablet" << false;

94 QTest::newRow("tablet") << "tablet" << false;

93 QTest::newRow("handset") << "handset" << false;

95 QTest::newRow("handset") << "handset" << false;

94− QTest::newRow("vm") << "vm" << true;

96+ QTest::newRow("watch") << "watch" << false;

95− QTest::newRow("container") << "container" << true;

97+ QTest::newRow("embedded") << "embedded" << true;

96 }

98 }

98 void testIsPC()

100 void testIsPC()