From 3515f1a9402446a262c3e90fbc388b6a3922f661 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 30 Apr 2012 18:54:45 +0100
Subject: [PATCH] Move TpDebugClient generated code to cli-misc.[ch] and don't
 document it

---
 docs/reference/telepathy-glib-sections.txt |    8 ++++----
 telepathy-glib/cli-misc.c                  |    1 +
 telepathy-glib/cli-misc.h                  |    2 ++
 telepathy-glib/debug-client.c              |    2 --
 telepathy-glib/debug-client.h              |    2 --
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index f242ae1..7d23799 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -5927,10 +5927,6 @@ TpBaseMediaCallChannelPrivate
 <SUBSECTION>
 TpDebugClient
 TpDebugClientClass
-tp_cli_debug_call_get_messages
-tp_cli_debug_callback_for_get_messages
-tp_cli_debug_connect_to_new_debug_message
-tp_cli_debug_signal_callback_new_debug_message
 tp_debug_client_init_known_interfaces
 tp_debug_client_new
 tp_debug_client_set_enabled_async
@@ -5948,6 +5944,10 @@ tp_debug_client_get_type
 tp_debug_client_get_feature_quark_core
 <SUBSECTION Private>
 TpDebugClientPrivate
+tp_cli_debug_call_get_messages
+tp_cli_debug_callback_for_get_messages
+tp_cli_debug_connect_to_new_debug_message
+tp_cli_debug_signal_callback_new_debug_message
 </SECTION>
 
 <SECTION>
diff --git a/telepathy-glib/cli-misc.c b/telepathy-glib/cli-misc.c
index e65334e..4479109 100644
--- a/telepathy-glib/cli-misc.c
+++ b/telepathy-glib/cli-misc.c
@@ -39,5 +39,6 @@
 #include "telepathy-glib/_gen/tp-cli-client-body.h"
 #include "telepathy-glib/_gen/tp-cli-connection-manager-body.h"
 #include "telepathy-glib/_gen/tp-cli-dbus-daemon-body.h"
+#include "telepathy-glib/_gen/tp-cli-debug-body.h"
 #include "telepathy-glib/_gen/tp-cli-generic-body.h"
 #include "telepathy-glib/_gen/tp-cli-protocol-body.h"
diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h
index 9efc661..1dc079b 100644
--- a/telepathy-glib/cli-misc.h
+++ b/telepathy-glib/cli-misc.h
@@ -29,6 +29,7 @@
 #include <telepathy-glib/channel-request.h>
 #include <telepathy-glib/client.h>
 #include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/debug-client.h>
 #include <telepathy-glib/protocol.h>
 #include <telepathy-glib/proxy.h>
 
@@ -40,6 +41,7 @@
 #include <telepathy-glib/_gen/tp-cli-client.h>
 #include <telepathy-glib/_gen/tp-cli-connection-manager.h>
 #include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
+#include <telepathy-glib/_gen/tp-cli-debug.h>
 #include <telepathy-glib/_gen/tp-cli-generic.h>
 #include <telepathy-glib/_gen/tp-cli-protocol.h>
 
diff --git a/telepathy-glib/debug-client.c b/telepathy-glib/debug-client.c
index 84115e5..f536e98 100644
--- a/telepathy-glib/debug-client.c
+++ b/telepathy-glib/debug-client.c
@@ -35,8 +35,6 @@
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/util-internal.h"
 
-#include "telepathy-glib/_gen/tp-cli-debug-body.h"
-
 /**
  * SECTION:debug-client
  * @title: TpDebugClient
diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h
index 861be03..bcd3ebe 100644
--- a/telepathy-glib/debug-client.h
+++ b/telepathy-glib/debug-client.h
@@ -86,6 +86,4 @@ GPtrArray * tp_debug_client_get_messages_finish (TpDebugClient *self,
 
 G_END_DECLS
 
-#include <telepathy-glib/_gen/tp-cli-debug.h>
-
 #endif
-- 
1.7.10