From 3a817d6e47bc7bdf8008a71f8415cf44799a07b7 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 18 Sep 2018 11:05:44 +0100
Subject: Add more deprecation comments

Not every doc-comment marked the documented thing as deprecated, but
they all should, because the entire library is deprecated.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 dbus/dbus-glib.c    | 13 +++++++++++++
 dbus/dbus-gobject.c |  2 ++
 dbus/dbus-gproxy.c  |  8 ++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dbus/dbus-glib.c b/dbus/dbus-glib.c
index 9723882..d969b56 100644
--- a/dbus/dbus-glib.c
+++ b/dbus/dbus-glib.c
@@ -39,6 +39,9 @@
  * @stability: Stable
  *
  * A #DBusGConnection is a boxed type abstracting a DBusConnection.
+ *
+ * Deprecated: New code should use #GDBusConnection from the GIO library,
+ *  which is not based on libdbus or dbus-glib.
  */
 
 /**
@@ -113,6 +116,8 @@ dbus_g_connection_unref (DBusGConnection *connection)
  * @stability: Stable
  *
  * A #DBusGMessage is a boxed type abstracting a DBusMessage.
+ *
+ * Deprecated: New code should use #GDBusMessage instead.
  */
 
 /**
@@ -169,6 +174,8 @@ dbus_g_message_unref (DBusGMessage *message)
  * @stability: Stable
  *
  * #DBusGError is the #GError used by DBus.
+ *
+ * Deprecated: New code should use GDBus and its #GDBusError enum instead.
  */
 
 /**
@@ -352,6 +359,8 @@ dbus_g_message_get_g_type (void)
  * @stability: Unstable
  *
  * These functions can be used to access lower level of DBus.
+ *
+ * Deprecated: New code should use GDBus instead.
  */
 
 /**
@@ -607,6 +616,8 @@ dbus_g_bus_get_private (DBusBusType     type,
  * connection.
  *
  * Deprecated: New code should use GDBus instead.
+ *  Modules that need to connect `libdbus` to a GLib main loop should
+ *  use the dbus-gmain submodule via `git subtree` or `git submodule`.
  */
 void
 dbus_connection_setup_with_g_main (DBusConnection  *connection,
@@ -630,6 +641,8 @@ dbus_connection_setup_with_g_main (DBusConnection  *connection,
  * connection.
  *
  * Deprecated: New code should use GDBus instead.
+ *  Modules that need to connect `libdbus` to a GLib main loop should
+ *  use the dbus-gmain submodule via `git subtree` or `git submodule`.
  */
 void
 dbus_server_setup_with_g_main     (DBusServer      *server,
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index aebd97a..49ebe04 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -2602,6 +2602,8 @@ dbus_g_error_info_free (gpointer p)
  * @stability: Stable
  *
  * FIXME
+ *
+ * Deprecated: New code should use GDBus instead.
  */
 
 /**
diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
index 2ced17b..ddf8bbe 100644
--- a/dbus/dbus-gproxy.c
+++ b/dbus/dbus-gproxy.c
@@ -1500,7 +1500,7 @@ dbus_g_proxy_class_init (DBusGProxyClass *klass)
  * DBusGProxy::destroy:
  * @dbusgproxy: the object which received the signal.
  *
- *
+ * Deprecated: New code should use #GDBusProxy instead.
  */
   signals[DESTROY] =
     g_signal_new ("destroy",
@@ -1515,7 +1515,7 @@ dbus_g_proxy_class_init (DBusGProxyClass *klass)
  * DBusGProxy::received:
  * @dbusgproxy: the object which received the signal.
  *
- *
+ * Deprecated: New code should use #GDBusProxy instead.
  */
   signals[RECEIVED] =
     g_signal_new ("received",
@@ -1942,6 +1942,8 @@ manager_begin_bus_call (DBusGProxyManager    *manager,
  *
  * A #DBusGProxy is a #GObject representing a remote object in a D-Bus
  * service.
+ *
+ * Deprecated: New code should use #GDBusProxy instead.
  */
 
 /**
@@ -1968,6 +1970,8 @@ manager_begin_bus_call (DBusGProxyManager    *manager,
  * Standard GObject get_type() function for DBusGProxy.
  *
  * Returns: type ID for DBusGProxy class
+ *
+ * Deprecated: New code should use #GDBusProxy instead.
  */
 GType
 dbus_g_proxy_get_type (void)
-- 
cgit v1.2.1