5d89533 · unity8 · git.iko.soy

Panel/IndicatorsDataModel.qml−8

@@ -68,14 +68,6 @@ Indicators.IndicatorsModel {

68 'description' : '',

69 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',

70 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'

71− },

72−

73− // OLD FORMAT INDICATORS

74− 'chewie-network' : {

75− 'title': 'Networks',

76− 'description' : '',

77− 'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorWidget.qml',

78− 'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'

79 }

71 }

80 }

72 }

81}

73}

src/Panel/Indicators/servicefiles/CMakeLists.txt−1

@@ -1,6 +1,5 @@

1file(GLOB INDICATOR_SERVICE_FILES

2 ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.indicator.messages

3− ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.settings.network

4)

3)

5

4

6# copy indicators files into build directory for shadow builds

5# copy indicators files into build directory for shadow builds

src/Panel/Indicators/servicefiles/com.canonical.settings.networkdeleted−10

@@ -1,10 +0,0 @@

1−[Indicator Service]

2−Name=chewie-network

3−ObjectPath=/com/canonical/settings/network

4−Position=69

5−

6−[phone]

7−ObjectPath=/com/canonical/settings/network/phone

8−

9−[desktop]

10−ObjectPath=/com/canonical/settings/network/desktop