From b9dcc0f75569396fee79bae315d86861cc775cd8 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Nov 2010 13:45:24 +0100 Subject: [PATCH] Remove some leftovers from Device/Network interface removal --- HACKING | 10 ---------- test/monitor-manager | 3 +-- test/monitor-services | 3 +-- test/show-introspection | 12 +++--------- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/HACKING b/HACKING index 444caf5..05fb69c 100644 --- a/HACKING +++ b/HACKING @@ -102,16 +102,6 @@ Running the daemon with debugging information in the foreground is quite verbose and sometimes not really helpful. The "monitor-connman" script allows to monitor "PropertyChanged" D-Bus signals from various interfaces. - During start of daemon - {Manager} [/] Devices = dbus.Array([dbus.ObjectPath('/dev_00_90_CC ... - {Device} [/dev_00_90_CC_xx_xx_xx] Powered = 1 - {Device} [/dev_00_90_CC_xx_xx_xx] Networks = dbus.Array( ... - - During shutdown of daemon - {Device} [/dev_00_90_CC_xx_xx_xx] Networks = dbus.Array( ... - {Device} [/dev_00_90_CC_xx_xx_xx] Powered = 0 - {Manager} [/] Devices = dbus.Array([], ... - Every "PropertyChanged" signal will generate a line of output. Some of them can get very complex. The first detail inside "{ ... }" is the interface name (without its service name prefix). The second detail inside "[ ... ]" diff --git a/test/monitor-manager b/test/monitor-manager index 82ca805..f9fe26a 100755 --- a/test/monitor-manager +++ b/test/monitor-manager @@ -6,8 +6,7 @@ import dbus import dbus.mainloop.glib def property_changed(name, value): - if name in ["Profiles", "Services", "Providers", "Technologies", - "Devices", "Networks"]: + if name in ["Profiles", "Services", "Providers", "Technologies"]: val = "[" for i in value: val = val + " " + i[i.rfind("/") + 1:] diff --git a/test/monitor-services b/test/monitor-services index b7c95de..8a05c2f 100755 --- a/test/monitor-services +++ b/test/monitor-services @@ -25,8 +25,7 @@ def extract_list(list): def property_changed(name, value, path): service = path[path.rfind("/") + 1:] - if name in ["Profiles", "Services", "Providers", "Technologies", - "Devices", "Networks"]: + if name in ["Profiles", "Services", "Providers", "Technologies"] val = "[" for i in value: val = val + " " + i[i.rfind("/") + 1:] diff --git a/test/show-introspection b/test/show-introspection index 5e392c7..e64dd27 100755 --- a/test/show-introspection +++ b/test/show-introspection @@ -15,13 +15,7 @@ manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), properties = manager.GetProperties() for path in properties["Technologies"]: - technology = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Technology") + object = dbus.Interface(bus.get_object("org.moblin.connman", path), + "org.freedesktop.DBus.Introspectable") - properties = technology.GetProperties() - - for path in properties["Devices"]: - object = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.freedesktop.DBus.Introspectable") - - print object.Introspect() + print object.Introspect() -- 2.7.4