summaryrefslogtreecommitdiff
path: root/bus/signals.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-18 20:42:15 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-18 20:42:15 +0000
commit8873c90f99303f9cc308f15f8d03e637911f5b9e (patch)
tree03e459881912388cc6c3759d91fb0cf75739a5a7 /bus/signals.c
parent4fce285052c143296cd9e08a48de0175b5207853 (diff)
2005-01-18 Havoc Pennington <hp@redhat.com>
* Throughout, grand renaming to strip out the use of "service", just say "name" instead (or "bus name" when ambiguous). Did not change the internal code of the message bus itself, only the programmer-facing API and messages. * doc/dbus-specification.xml: further update the message bus section * bus/config-parser.c (all_are_equiv): fix bug using freed string in error case
Diffstat (limited to 'bus/signals.c')
-rw-r--r--bus/signals.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/signals.c b/bus/signals.c
index 2b5aa13f8..eedeff6f3 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -657,10 +657,10 @@ bus_match_rule_parse (DBusConnection *matches_go_to,
goto failed;
}
- if (!_dbus_validate_service (&tmp_str, 0, len))
+ if (!_dbus_validate_bus_name (&tmp_str, 0, len))
{
dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID,
- "Sender service name '%s' is invalid\n", value);
+ "Sender name '%s' is invalid\n", value);
goto failed;
}
@@ -745,10 +745,10 @@ bus_match_rule_parse (DBusConnection *matches_go_to,
goto failed;
}
- if (!_dbus_validate_service (&tmp_str, 0, len))
+ if (!_dbus_validate_bus_name (&tmp_str, 0, len))
{
dbus_set_error (error, DBUS_ERROR_MATCH_RULE_INVALID,
- "Destination service name '%s' is invalid\n", value);
+ "Destination name '%s' is invalid\n", value);
goto failed;
}