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))__

1 files changed, 27 insertions, 25 deletions

diff --git a/bus/bus.h b/bus/bus.h
index 60290c04..754fab04 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -30,31 +30,33 @@
 #include <dbus/dbus-string.h>
 #include <dbus/dbus-mainloop.h>
 
-typedef struct BusActivation  BusActivation;
-typedef struct BusConnections BusConnections;
-typedef struct BusContext     BusContext;
-typedef struct BusPolicy      BusPolicy;
-typedef struct BusPolicyRule  BusPolicyRule;
-typedef struct BusRegistry    BusRegistry;
-typedef struct BusService     BusService;
-typedef struct BusTransaction BusTransaction;
+typedef struct BusActivation    BusActivation;
+typedef struct BusConnections   BusConnections;
+typedef struct BusContext       BusContext;
+typedef struct BusPolicy        BusPolicy;
+typedef struct BusClientPolicy  BusClientPolicy;
+typedef struct BusPolicyRule    BusPolicyRule;
+typedef struct BusRegistry      BusRegistry;
+typedef struct BusService       BusService;
+typedef struct BusTransaction   BusTransaction;
+
+BusContext*      bus_context_new                    (const DBusString *config_file,
+                                                     int               print_addr_fd,
+                                                     DBusError        *error);
+void             bus_context_shutdown               (BusContext       *context);
+void             bus_context_ref                    (BusContext       *context);
+void             bus_context_unref                  (BusContext       *context);
+const char*      bus_context_get_type               (BusContext       *context);
+const char*      bus_context_get_address            (BusContext       *context);
+BusRegistry*     bus_context_get_registry           (BusContext       *context);
+BusConnections*  bus_context_get_connections        (BusContext       *context);
+BusActivation*   bus_context_get_activation         (BusContext       *context);
+DBusLoop*        bus_context_get_loop               (BusContext       *context);
+dbus_bool_t      bus_context_allow_user             (BusContext       *context,
+                                                     unsigned long     uid);
+BusClientPolicy* bus_context_create_client_policy   (BusContext       *context,
+                                                     DBusConnection   *connection);
+int              bus_context_get_activation_timeout (BusContext       *context);
 
-BusContext*     bus_context_new                      (const DBusString *config_file,
-                                                      int               print_addr_fd,
-                                                      DBusError        *error);
-void            bus_context_shutdown                 (BusContext       *context);
-void            bus_context_ref                      (BusContext       *context);
-void            bus_context_unref                    (BusContext       *context);
-const char*     bus_context_get_type                 (BusContext       *context);
-const char*     bus_context_get_address              (BusContext       *context);
-BusRegistry*    bus_context_get_registry             (BusContext       *context);
-BusConnections* bus_context_get_connections          (BusContext       *context);
-BusActivation*  bus_context_get_activation           (BusContext       *context);
-DBusLoop*       bus_context_get_loop                 (BusContext       *context);
-dbus_bool_t     bus_context_allow_user               (BusContext       *context,
-                                                      unsigned long     uid);
-BusPolicy*      bus_context_create_connection_policy (BusContext       *context,
-                                                      DBusConnection   *connection);
-int             bus_context_get_activation_timeout   (BusContext       *context);
 
 #endif /* BUS_BUS_H */