diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-12 18:32:11 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-12 18:32:11 +0000 |
| commit | bc983ecf15455f49e7a92d038c93e181ae2cb438 (patch) | |
| tree | d53948dab970d81f07e195513804945b87a758e8 /bus/connection.c | |
| parent | 4b773b4a5448ac9bea2cc57486571588fdc14480 (diff) | |
| download | dbus-bc983ecf15455f49e7a92d038c93e181ae2cb438.tar.gz | |
2003-04-12 Havoc Pennington <hp@pobox.com>
* bus/policy.h: change BusPolicy to be the thing from the config
file, and rename old BusPolicy to BusClientPolicy
* bus/bus.c, bus/connection.c, bus/config-parser.c: change to
match change in how policy works
* dbus/dbus-internals.h: mark assert_not_reached as
__attribute((noreturn))__
Diffstat (limited to 'bus/connection.c')
| -rw-r--r-- | bus/connection.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bus/connection.c b/bus/connection.c index 2cfbeb27..21c8f1a3 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -50,7 +50,7 @@ typedef struct DBusPreallocatedSend *oom_preallocated; unsigned long *group_ids; int n_group_ids; - BusPolicy *policy; + BusClientPolicy *policy; } BusConnectionData; #define BUS_CONNECTION_DATA(connection) (dbus_connection_get_data ((connection), connection_data_slot)) @@ -306,7 +306,7 @@ free_connection_data (void *data) dbus_message_unref (d->oom_message); if (d->policy) - bus_policy_unref (d->policy); + bus_client_policy_unref (d->policy); dbus_free (d->group_ids); @@ -541,7 +541,7 @@ bus_connection_is_in_group (DBusConnection *connection, return FALSE; } -BusPolicy* +BusClientPolicy* bus_connection_get_policy (DBusConnection *connection) { BusConnectionData *d; @@ -562,8 +562,8 @@ bus_connection_get_policy (DBusConnection *connection) if (d->policy == NULL) { d->policy = - bus_context_create_connection_policy (d->connections->context, - connection); + bus_context_create_client_policy (d->connections->context, + connection); /* we may have a NULL policy on OOM or error getting list of * groups for a user. In the latter case we don't handle it so |