From faea93e361982638bdb99b917e764a8d10dd0ac9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 6 Mar 2012 18:51:39 +0000
Subject: [PATCH 07/10] Move CM, Protocol to cli-misc.h

---
 docs/reference/telepathy-glib-docs.sgml    |    1 +
 docs/reference/telepathy-glib-sections.txt |   25 +++++++++++++++----------
 examples/client/extended-client.c          |    1 +
 telepathy-glib/cli-misc.h                  |    4 ++++
 telepathy-glib/connection-manager.h        |    2 --
 telepathy-glib/protocol.c                  |    1 +
 telepathy-glib/protocol.h                  |    2 --
 tests/dbus/example-no-protocols.c          |    1 +
 tests/dbus/message-mixin.c                 |    1 +
 tests/dbus/params-cm.c                     |    1 +
 10 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml
index 03c3743..a8335c2 100644
--- a/docs/reference/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib-docs.sgml
@@ -34,6 +34,7 @@
   <chapter id="ch-client">
     <title>Client-side proxies</title>
     <xi:include href="xml/connection-manager.xml"/>
+    <xi:include href="xml/cli-connection-manager.xml"/>
     <xi:include href="xml/protocol.xml"/>
     <xi:include href="xml/connection.xml"/>
     <xi:include href="xml/contact.xml"/>
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 781abb3..9e9410e 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -3668,11 +3668,25 @@ TP_IS_CONNECTION_MANAGER
 TP_IS_CONNECTION_MANAGER_CLASS
 TpConnectionManagerPrivate
 tp_connection_manager_get_feature_quark_core
-<SUBSECTION>
+</SECTION>
+
+<SECTION>
+<FILE>cli-connection-manager</FILE>
+<TITLE>cli-connection-manager</TITLE>
+<INCLUDE>telepathy-glib/cli-misc.h</INCLUDE>
 tp_cli_connection_manager_callback_for_request_connection
 tp_cli_connection_manager_call_request_connection
 tp_cli_connection_manager_signal_callback_new_connection
 tp_cli_connection_manager_connect_to_new_connection
+<SUBSECTION>
+tp_cli_protocol_call_identify_account
+tp_cli_protocol_call_normalize_contact
+tp_cli_protocol_callback_for_identify_account
+tp_cli_protocol_callback_for_normalize_contact
+tp_cli_protocol_interface_addressing_call_normalize_contact_uri
+tp_cli_protocol_interface_addressing_call_normalize_vcard_address
+tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri
+tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_address
 </SECTION>
 
 <SECTION>
@@ -4731,15 +4745,6 @@ tp_protocol_get_icon_name
 tp_protocol_get_vcard_field
 tp_protocol_get_authentication_types
 tp_protocol_get_avatar_requirements
-<SUBSECTION>
-tp_cli_protocol_call_identify_account
-tp_cli_protocol_call_normalize_contact
-tp_cli_protocol_callback_for_identify_account
-tp_cli_protocol_callback_for_normalize_contact
-tp_cli_protocol_interface_addressing_call_normalize_contact_uri
-tp_cli_protocol_interface_addressing_call_normalize_vcard_address
-tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri
-tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_address
 <SUBSECTION Standard>
 tp_protocol_get_type
 TP_PROTOCOL
diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c
index 7399533..3afc424 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 
 #include <telepathy-glib/cli-connection.h>
+#include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 /* Usually this'd be a top-level extensions/ directory in practice */
diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h
index e20685d..e7417bb 100644
--- a/telepathy-glib/cli-misc.h
+++ b/telepathy-glib/cli-misc.h
@@ -22,10 +22,14 @@
 #ifndef TELEPATHY_GLIB_CLI_MISC_H
 #define TELEPATHY_GLIB_CLI_MISC_H
 
+#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/protocol.h>
 #include <telepathy-glib/proxy.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-generic.h>
+#include <telepathy-glib/_gen/tp-cli-protocol.h>
 
 #endif
 
diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
index 423b051..6f543e72 100644
--- a/telepathy-glib/connection-manager.h
+++ b/telepathy-glib/connection-manager.h
@@ -192,6 +192,4 @@ void tp_connection_manager_protocol_free (TpConnectionManagerProtocol *proto);
 
 G_END_DECLS
 
-#include <telepathy-glib/_gen/tp-cli-connection-manager.h>
-
 #endif
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 00d65f8..f1e3aab 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -42,6 +42,7 @@
 
 #define DEBUG_FLAG TP_DEBUG_PARAMS
 #include "telepathy-glib/capabilities-internal.h"
+#include "telepathy-glib/cli-misc.h"
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index 8b25390..e61c494 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -107,6 +107,4 @@ TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *self);
 
 G_END_DECLS
 
-#include <telepathy-glib/_gen/tp-cli-protocol.h>
-
 #endif
diff --git a/tests/dbus/example-no-protocols.c b/tests/dbus/example-no-protocols.c
index 32c871b..594b923 100644
--- a/tests/dbus/example-no-protocols.c
+++ b/tests/dbus/example-no-protocols.c
@@ -2,6 +2,7 @@
 
 #include <glib-object.h>
 #include <telepathy-glib/cli-connection.h>
+#include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/debug.h>
 #include <telepathy-glib/defs.h>
diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
index 4f1e4a5..df105ed 100644
--- a/tests/dbus/message-mixin.c
+++ b/tests/dbus/message-mixin.c
@@ -13,6 +13,7 @@
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-connection.h>
+#include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/debug.h>
diff --git a/tests/dbus/params-cm.c b/tests/dbus/params-cm.c
index 45dd1f6..d8be8eb 100644
--- a/tests/dbus/params-cm.c
+++ b/tests/dbus/params-cm.c
@@ -22,6 +22,7 @@
 
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/cli-connection.h>
+#include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/debug.h>
-- 
1.7.9.1