X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus.h;h=bfb236ec8e7da68b79259b92b56a68c63d276c34;hp=b5c28c6ab6f78f7e05738b0b06355759f18cd473;hb=1683342af1fc85e75ba21264bbcedc26aef0fa39;hpb=6fa4853328e3d78d092172fa54effb7e785d0a85

diff --git a/src/core/dbus.h b/src/core/dbus.h
index b5c28c6ab..bfb236ec8 100644
--- a/src/core/dbus.h
+++ b/src/core/dbus.h
@@ -21,35 +21,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dbus/dbus.h>
-
 #include "manager.h"
 
+int bus_send_queued_message(Manager *m);
+
 int bus_init(Manager *m, bool try_bus_connect);
 void bus_done(Manager *m);
 
-unsigned bus_dispatch(Manager *m);
-
-void bus_watch_event(Manager *m, Watch *w, int events);
-void bus_timeout_event(Manager *m, Watch *w, int events);
-
-int bus_query_pid(Manager *m, const char *name);
-
-int bus_broadcast(Manager *m, DBusMessage *message);
-
-bool bus_has_subscriber(Manager *m);
-bool bus_connection_has_subscriber(Manager *m, DBusConnection *c);
-
 int bus_fdset_add_all(Manager *m, FDSet *fds);
 
-void bus_broadcast_finished(Manager *m, usec_t firmware_usec, usec_t loader_usec, usec_t kernel_usec, usec_t initrd_usec, usec_t userspace_usec, usec_t total_usec);
-
-Set *bus_acquire_subscribed(Manager *m, DBusConnection *c);
-
-void bus_serialize(Manager *m, FILE *f);
-int bus_deserialize_item(Manager *m, const char *line);
-
-#define BUS_CONNECTION_SUBSCRIBED(m, c) dbus_connection_get_data((c), (m)->subscribed_data_slot)
-#define BUS_PENDING_CALL_NAME(m, p) dbus_pending_call_get_data((p), (m)->name_data_slot)
+void bus_track_serialize(sd_bus_track *t, FILE *f);
+int bus_track_deserialize_item(char ***l, const char *line);
+int bus_track_coldplug(Manager *m, sd_bus_track **t, char ***l);
 
-extern const char * const bus_interface_table[];
+int bus_foreach_bus(Manager *m, sd_bus_track *subscribed2, int (*send_message)(sd_bus *bus, void *userdata), void *userdata);