[telepathy-mission-control/master] McdConnection: move unexported functions to a new mcd-connection-priv.h

[Simon McVittie]

---
 src/Makefile.am              |    1 +
 src/mcd-account-connection.c |    1 +
 src/mcd-account-manager.c    |    1 +
 src/mcd-account.c            |    1 +
 src/mcd-connection-priv.h    |   46 ++++++++++++++++++++++++++++++++++++++++++
 src/mcd-connection.c         |    4 ++-
 src/mcd-connection.h         |   11 ----------
 7 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 src/mcd-connection-priv.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 58afe16..5b0239e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,6 +137,7 @@ libmissioncontrol_server_la_SOURCES = \
 	mcd-master.c \
 	mcd-manager.c \
 	mcd-connection.c \
+	mcd-connection-priv.h \
 	mcd-dispatcher.c \
 	mcd-channel.c \
 	mcd-service.c \
diff --git a/src/mcd-account-connection.c b/src/mcd-account-connection.c
index 308a9df..92ddb32 100644
--- a/src/mcd-account-connection.c
+++ b/src/mcd-account-connection.c
@@ -34,6 +34,7 @@
 #include "mcd-account-priv.h"
 #include "mcd-account-connection.h"
 #include "mcd-account-manager.h"
+#include "mcd-connection-priv.h"
 
 typedef struct {
     GHashTable *params;
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 863a8fc..6a46def 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -39,6 +39,7 @@
 #include "mcd-account.h"
 #include "mcd-account-config.h"
 #include "mcd-account-priv.h"
+#include "mcd-connection-priv.h"
 #include "mcd-dbusprop.h"
 #include "mcd-misc.h"
 #include "_gen/interfaces.h"
diff --git a/src/mcd-account.c b/src/mcd-account.c
index eab28f5..598f473 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -44,6 +44,7 @@
 #include "mcd-account-requests.h"
 #include "mcd-account-stats.h"
 #include "mcd-connection-plugin.h"
+#include "mcd-connection-priv.h"
 #include "mcd-misc.h"
 #include "mcd-signals-marshal.h"
 #include "mcd-manager.h"
diff --git a/src/mcd-connection-priv.h b/src/mcd-connection-priv.h
new file mode 100644
index 0000000..3e407e4
--- /dev/null
+++ b/src/mcd-connection-priv.h
@@ -0,0 +1,46 @@
+/* vi: set et sw=4 ts=8 cino=t0,(0: */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 8 -*- */
+/*
+ * This file is part of mission-control
+ *
+ * Copyright (C) 2007 Nokia Corporation
+ *
+ * Contact: Naba Kumar  <naba.kumar at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __MCD_CONNECTION_PRIV_H__
+#define __MCD_CONNECTION_PRIV_H__
+
+#include "mcd-connection.h"
+
+G_BEGIN_DECLS
+
+G_GNUC_INTERNAL void _mcd_connection_connect (McdConnection *connection,
+                                              GHashTable *params);
+G_GNUC_INTERNAL
+void _mcd_connection_update_property (McdConnection *connection,
+                                      const gchar *name, const GValue *value);
+G_GNUC_INTERNAL
+void _mcd_connection_set_tp_connection (McdConnection *connection,
+                                        const gchar *bus_name,
+                                        const gchar *obj_path, GError **error);
+
+G_END_DECLS
+
+#endif
+
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 9e8ed0e..6ed398b 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -34,6 +34,8 @@
  * FIXME
  */
 
+#include "mcd-connection.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <sched.h>
@@ -54,7 +56,7 @@
 #include <libmcclient/mc-errors.h>
 
 #include "mcd-account-priv.h"
-#include "mcd-connection.h"
+#include "mcd-connection-priv.h"
 #include "mcd-account-connection.h"
 #include "mcd-channel.h"
 #include "mcd-provisioning-factory.h"
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index aba10cf..fc437be 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -88,18 +88,7 @@ gboolean mcd_connection_cancel_channel_request (McdConnection *connection,
 						const gchar *requestor_client_id,
 					       	GError **error);
 
-G_GNUC_INTERNAL void _mcd_connection_connect (McdConnection *connection,
-                                              GHashTable *params);
 void mcd_connection_close (McdConnection *connection);
 
-/* not exported */
-G_GNUC_INTERNAL
-void _mcd_connection_update_property (McdConnection *connection,
-                                      const gchar *name, const GValue *value);
-G_GNUC_INTERNAL
-void _mcd_connection_set_tp_connection (McdConnection *connection,
-                                        const gchar *bus_name,
-                                        const gchar *obj_path, GError **error);
-
 G_END_DECLS
 #endif /* __MCD_CONNECTION_H__ */
-- 
1.5.6.5