diff options
| author | Colin Walters <walters@verbum.org> | 2010-02-22 09:48:45 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-02-22 09:48:45 -0500 |
| commit | e1c31c73074513d96fa22b5c0355107c42720597 (patch) | |
| tree | e1216637b5f52540e279f0f1f3ef9662c4437978 /bus/dir-watch-default.c | |
| parent | 235eebdb1618ecdd0f752c9bcd92c61d17752e0b (diff) | |
| parent | fbeb13517ef667b8ed4136bcb9e52ff9924419c1 (diff) | |
| download | dbus-e1c31c73074513d96fa22b5c0355107c42720597.tar.gz | |
Merge branch 'dbus-1.2'
Conflicts:
bus/bus.c
bus/selinux.c
configure.in
Diffstat (limited to 'bus/dir-watch-default.c')
| -rw-r--r-- | bus/dir-watch-default.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c index ff70d080..e7f8451b 100644 --- a/bus/dir-watch-default.c +++ b/bus/dir-watch-default.c @@ -29,13 +29,13 @@ /* NoOp */ -void -bus_drop_all_directory_watches (void) +void +bus_watch_directory (const char *dir, BusContext *context) { } void -bus_watch_directory (const char *dir, BusContext *context) +bus_set_watched_dirs (BusContext *context, DBusList **directories) { } |