diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-07 16:12:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-07 16:12:22 +0100 |
| commit | 97bf0b2b4876bad135c7ea9eee30c2ddecc51ada (patch) | |
| tree | fa570eb45f4836a545d8d14ad6d66c984acfba6e /bus/signals.h | |
| parent | a9f76f20a0d5782991663c2671ff009375a06a20 (diff) | |
| download | dbus-97bf0b2b4876bad135c7ea9eee30c2ddecc51ada.tar.gz | |
Rename path_prefix to path_namespace and disallow trailing '/'
Also disallow having both path and path_namespace in the same match rule
(it wouldn't make sense, path is more specific than path_namespace).
As per IRC discussion with davidz and wjt.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34870
Diffstat (limited to 'bus/signals.h')
| -rw-r--r-- | bus/signals.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/bus/signals.h b/bus/signals.h index 0053bd5d..5b086f04 100644 --- a/bus/signals.h +++ b/bus/signals.h @@ -31,14 +31,14 @@ typedef enum { - BUS_MATCH_MESSAGE_TYPE = 1 << 0, - BUS_MATCH_INTERFACE = 1 << 1, - BUS_MATCH_MEMBER = 1 << 2, - BUS_MATCH_SENDER = 1 << 3, - BUS_MATCH_DESTINATION = 1 << 4, - BUS_MATCH_PATH = 1 << 5, - BUS_MATCH_ARGS = 1 << 6, - BUS_MATCH_PATH_PREFIX = 1 << 7 + BUS_MATCH_MESSAGE_TYPE = 1 << 0, + BUS_MATCH_INTERFACE = 1 << 1, + BUS_MATCH_MEMBER = 1 << 2, + BUS_MATCH_SENDER = 1 << 3, + BUS_MATCH_DESTINATION = 1 << 4, + BUS_MATCH_PATH = 1 << 5, + BUS_MATCH_ARGS = 1 << 6, + BUS_MATCH_PATH_NAMESPACE = 1 << 7 } BusMatchFlags; BusMatchRule* bus_match_rule_new (DBusConnection *matches_go_to); @@ -56,9 +56,8 @@ dbus_bool_t bus_match_rule_set_sender (BusMatchRule *rule, dbus_bool_t bus_match_rule_set_destination (BusMatchRule *rule, const char *destination); dbus_bool_t bus_match_rule_set_path (BusMatchRule *rule, - const char *path); -dbus_bool_t bus_match_rule_set_path_prefix (BusMatchRule *rule, - const char *path_prefix); + const char *path, + dbus_bool_t is_namespace); dbus_bool_t bus_match_rule_set_arg (BusMatchRule *rule, int arg, const DBusString *value, |