diff options
| author | David Zeuthen <david@fubar.dk> | 2004-03-29 23:08:04 +0000 |
|---|---|---|
| committer | David Zeuthen <david@fubar.dk> | 2004-03-29 23:08:04 +0000 |
| commit | 1b9ece3222b4eae5aeedb39a942a104b309e51f8 (patch) | |
| tree | 74caf689f53e1d51d516f236af214a0b13bca55a | |
| parent | c40486db8c502525903f5831269bece87abd9422 (diff) | |
Comment out noise trace call
Signal capability added even though target device already had the
capability. Fixes problem with monitoring ethernet devices.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | hald/device_store.c | 8 | ||||
| -rw-r--r-- | hald/linux/linux_class_net.c | 5 | ||||
| -rw-r--r-- | hald/main.c | 2 |
4 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2004-03-30 David Zeuthen <david@fubar.dk> + + * hald/main.c (device_get_all_properties): Comment out noise trace + call + + * hald/device_store.c + (ds_device_merge, ds_add_capability): Signal capability added even + though target device already had the capability. Fixes problem with + monitoring ethernet devices. + 2004-03-28 David Zeuthen <david@fubar.dk> * hald/linux/linux_class_block.c (visit_class_device_block): Remove diff --git a/hald/device_store.c b/hald/device_store.c index 4e215abd..28f672db 100644 --- a/hald/device_store.c +++ b/hald/device_store.c @@ -1351,9 +1351,9 @@ ds_device_merge (HalDevice * target, HalDevice * source) tok = strtok_r ((char *) caps, " ", &bufp); while (tok != NULL) { - if (!ds_query_capability (target, tok)) { - ds_add_capability (target, tok); - } + HAL_INFO (("adding tok=%s (from %s to %s)", tok, + source->udi, target->udi)); + ds_add_capability (target, tok); tok = strtok_r (NULL, " ", &bufp); } } @@ -1569,7 +1569,7 @@ ds_add_capability (HalDevice * device, const char *capability) capability); } else { if (ds_query_capability (device, capability)) { - return; + /*return;*/ } else { snprintf (buf, MAX_CAP_SIZE, "%s %s", caps, capability); diff --git a/hald/linux/linux_class_net.c b/hald/linux/linux_class_net.c index 591d1d7a..dd564429 100644 --- a/hald/linux/linux_class_net.c +++ b/hald/linux/linux_class_net.c @@ -482,7 +482,8 @@ static void new_capability (HalDevice * device, const char *capability, dbus_bool_t in_gdl) { - if (in_gdl) { + HAL_INFO (("device->udi=%s capability=%s", device->udi, capability)); + if (device->in_gdl) { if (strcmp (capability, "net.ethernet") == 0) { link_detection_add (device); } @@ -503,7 +504,7 @@ gdl_changed (HalDevice * device, dbus_bool_t is_added) } } else { /* We may not have added this device yet, but the - * callee checks for for this + * callee checks for this */ link_detection_remove (device); } diff --git a/hald/main.c b/hald/main.c index f9ccbad6..1151b8c2 100644 --- a/hald/main.c +++ b/hald/main.c @@ -568,7 +568,7 @@ device_get_all_properties (DBusConnection * connection, udi = dbus_message_get_path (message); - HAL_TRACE (("entering, udi=%s", udi)); + /*HAL_TRACE (("entering, udi=%s", udi));*/ d = ds_device_find (udi); if (d == NULL) { |