git.iko.soy/unity8
on xenial help sign in
Fixed network indicator not displaying
cd18e8fNick Dedekind
Panel/Indicators/NetworkIndicatorPage2.qml+1−1
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@ PageStack {
30 // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704
30 // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704
31 __propagated: null
31 __propagated: null
32
32
33− property alias title: _mainPage.title
33+ property alias title: pluginItem.title
34 property alias emptyText: pluginItem.emptyText
34 property alias emptyText: pluginItem.emptyText
35 property alias busName: pluginItem.busName
35 property alias busName: pluginItem.busName
36 property alias actionsObjectPath : pluginItem.actionsObjectPath
36 property alias actionsObjectPath : pluginItem.actionsObjectPath
plugins/Unity/Indicators/indicatorsmodel.cpp+3−1
@@ -276,7 +276,9 @@ QVariant IndicatorsModel::indicatorData(const Indicator::Ptr& indicator, int rol
276 if (indicator && m_parsed_indicator_data.contains(indicator->identifier()))
276 if (indicator && m_parsed_indicator_data.contains(indicator->identifier()))
277 {
277 {
278 QVariantMap data = m_parsed_indicator_data[indicator->identifier()];
278 QVariantMap data = m_parsed_indicator_data[indicator->identifier()];
279+ if (data.contains(roleNames()[role])) {
279− return data.value(roleNames()[role], QVariant());
280+ return data[roleNames()[role]];
281+ }
280 }
282 }
281 return defaultData(indicator, role);
283 return defaultData(indicator, role);
282}
284}