[telepathy-mission-control/master] mcd-account-requests: move unexported stuff to mcd-account-priv.h

[Simon McVittie]

---
 src/mcd-account-priv.h     |   15 +++++++++++++++
 src/mcd-account-requests.h |   14 --------------
 src/mcd-channel.c          |    1 +
 src/mcd-dispatcher.c       |    1 +
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 1083c9b..f8b4797 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -29,6 +29,8 @@
 #include "mcd-account.h"
 #include "mcd-account-compat.h"
 #include "mcd-account-config.h"
+#include "mcd-account-requests.h"
+#include "mcd-channel.h"
 #include "mcd-dbusprop.h"
 
 G_GNUC_INTERNAL void _mcd_account_connect (McdAccount *account,
@@ -123,5 +125,18 @@ void account_compat_iface_init (McSvcAccountInterfaceCompatClass *iface,
 G_GNUC_INTERNAL void _mcd_account_connection_begin (McdAccount *account);
 G_GNUC_INTERNAL void _mcd_account_connection_class_init (McdAccountClass *klass);
 
+extern const McdDBusProp account_channelrequests_properties[];
+
+G_GNUC_INTERNAL McdChannel *_mcd_account_create_request (McdAccount *account,
+    GHashTable *properties, gint64 user_action_time,
+    const gchar *preferred_handler, gboolean use_existing,
+    gboolean proceeding, GError **error);
+
+G_GNUC_INTERNAL void _mcd_account_proceed_with_request (McdAccount *account,
+                                                        McdChannel *channel);
+
+void account_channelrequests_iface_init
+    (McSvcAccountInterfaceChannelRequestsClass *iface, gpointer iface_data);
+
 #endif /* __MCD_ACCOUNT_PRIV_H__ */
 
diff --git a/src/mcd-account-requests.h b/src/mcd-account-requests.h
index 2440ca0..0c70b8c 100644
--- a/src/mcd-account-requests.h
+++ b/src/mcd-account-requests.h
@@ -32,19 +32,5 @@
 #include "mcd-dbusprop.h"
 
 G_BEGIN_DECLS
-
-extern const McdDBusProp account_channelrequests_properties[];
-
-G_GNUC_INTERNAL McdChannel *_mcd_account_create_request (McdAccount *account,
-    GHashTable *properties, gint64 user_action_time,
-    const gchar *preferred_handler, gboolean use_existing,
-    gboolean proceeding, GError **error);
-
-G_GNUC_INTERNAL void _mcd_account_proceed_with_request (McdAccount *account,
-                                                        McdChannel *channel);
-
-void account_channelrequests_iface_init
-    (McSvcAccountInterfaceChannelRequestsClass *iface, gpointer iface_data);
-
 G_END_DECLS
 #endif
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 10aae76..4af6b28 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -41,6 +41,7 @@
 #include <telepathy-glib/svc-generic.h>
 #include <telepathy-glib/util.h>
 
+#include "mcd-account-priv.h"
 #include "mcd-account-requests.h"
 #include "mcd-channel.h"
 #include "mcd-enum-types.h"
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 0b1e949..b971bf8 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -43,6 +43,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "mcd-signals-marshal.h"
+#include "mcd-account-priv.h"
 #include "mcd-account-requests.h"
 #include "mcd-connection.h"
 #include "mcd-channel.h"
-- 
1.5.6.5