@@ -95,20 +95,7 @@ class MainWindow(object):
9595 return self.app.select_single(objectName="pinentryField")
9696
9797 def get_indicator(self, indicator_name):
98− # TODO this is temporary until proper objectNames can be added
99− indicator_bus_names = {
100− 'indicator-network': 'com.canonical.indicator.network',
101− 'indicator-power': 'com.canonical.indicator.power',
102− 'indicator-bluetooth': 'com.canonical.indicator.bluetooth',
103− 'indicator-sound': 'com.canonical.indicator.sound',
104− 'indicator-location': 'com.canonical.indicator.location',
105− 'indicator-datetime': 'com.canonical.indicator.datetime',
106− 'indicator-location': 'com.canonical.indicator.location'
107− }
108− try:
109− return self.app.select_single(
110− 'DefaultIndicatorWidget',
111− busName=indicator_bus_names[indicator_name]
112− )
113− except IndexError:
114− return None
98+ return self.app.select_single(
99+ 'DefaultIndicatorWidget',
100+ objectName=indicator_name+'-widget'
101+ )