summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--dbus/dbus-bus.h2
-rw-r--r--dbus/dbus-connection-internal.h13
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e86ec772..0c1afcfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-22 Havoc Pennington <hp@redhat.com>
+
+ * dbus/dbus-connection-internal.h: move prototype of
+ _dbus_bus_notify_shared_connection_disconnected_unlocked() here so
+ it isn't in a public header and doesn't end up in the DBusBus
+ group in Doxygen
+
2006-10-21 Havoc Pennington <hp@redhat.com>
* Makefile.am (EXTRA_DIST): dist cleanup-man-pages.sh so it's in
diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index 2c697abd..e139254d 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -73,8 +73,6 @@ void dbus_bus_remove_match (DBusConnection *connection,
const char *rule,
DBusError *error);
-void _dbus_bus_notify_shared_connection_disconnected_unlocked (DBusConnection *connection);
-
/** @} */
DBUS_END_DECLS
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index 55775d2e..94026a20 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -102,6 +102,19 @@ void _dbus_connection_test_get_locks (DBusConnectio
DBusCondVar **dispatch_cond_loc,
DBusCondVar **io_path_cond_loc);
+/* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems
+ * silly for one function
+ */
+/**
+ * @addtogroup DBusBusInternals
+ * @{
+ */
+
+void _dbus_bus_notify_shared_connection_disconnected_unlocked (DBusConnection *connection);
+
+/** @} */
+
+
DBUS_END_DECLS
#endif /* DBUS_CONNECTION_INTERNAL_H */