[telepathy-mission-control/master] McdChannel: move unexported stuff to new mcd-channel-priv.h
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Apr 15 05:47:51 PDT 2009
---
src/Makefile.am | 1 +
src/mcd-account-requests.c | 1 +
src/mcd-channel-priv.h | 86 ++++++++++++++++++++++++++++++++++++++++++
src/mcd-channel.c | 4 +-
src/mcd-channel.h | 50 ------------------------
src/mcd-connection.c | 1 +
src/mcd-dispatch-operation.c | 1 +
src/mcd-dispatcher.c | 1 +
8 files changed, 94 insertions(+), 51 deletions(-)
create mode 100644 src/mcd-channel-priv.h
diff --git a/src/Makefile.am b/src/Makefile.am
index de3ff72..5fcdbf6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,6 +141,7 @@ libmissioncontrol_server_la_SOURCES = \
mcd-connection-priv.h \
mcd-dispatcher.c \
mcd-channel.c \
+ mcd-channel-priv.h \
mcd-service.c \
mcd-proxy.c \
mcd-chan-handler.c \
diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index aa48b67..fe3b5ba 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -38,6 +38,7 @@
#include "mcd-account-priv.h"
#include "mcd-account-requests.h"
#include "mcd-account-manager.h"
+#include "mcd-channel-priv.h"
#include "mcd-misc.h"
#include "_gen/interfaces.h"
#include "_gen/svc-request.h"
diff --git a/src/mcd-channel-priv.h b/src/mcd-channel-priv.h
new file mode 100644
index 0000000..d5e1be6
--- /dev/null
+++ b/src/mcd-channel-priv.h
@@ -0,0 +1,86 @@
+/* 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_CHANNEL_PRIV_H
+#define MCD_CHANNEL_PRIV_H
+
+#include "mcd-channel.h"
+
+G_BEGIN_DECLS
+
+G_GNUC_INTERNAL McdChannel *_mcd_channel_new_undispatched (void);
+
+G_GNUC_INTERNAL
+gboolean _mcd_channel_create_proxy (McdChannel *channel,
+ TpConnection *connection,
+ const gchar *object_path,
+ const GHashTable *properties);
+
+G_GNUC_INTERNAL
+void _mcd_channel_set_status (McdChannel *channel, McdChannelStatus status);
+
+/* not exported: */
+G_GNUC_INTERNAL void _mcd_channel_undispatchable (McdChannel *self);
+
+G_GNUC_INTERNAL
+gboolean _mcd_channel_create_proxy_old (McdChannel *channel,
+ TpConnection *connection,
+ const gchar *object_path,
+ const gchar *type, guint handle,
+ TpHandleType handle_type);
+G_GNUC_INTERNAL
+GHashTable *_mcd_channel_get_immutable_properties (McdChannel *channel);
+
+G_GNUC_INTERNAL
+GPtrArray *_mcd_channel_details_build_from_list (GList *channels);
+G_GNUC_INTERNAL
+void _mcd_channel_details_free (GPtrArray *channels);
+
+G_GNUC_INTERNAL
+const gchar *_mcd_channel_get_target_id (McdChannel *channel);
+G_GNUC_INTERNAL
+GHashTable *_mcd_channel_get_requested_properties (McdChannel *channel);
+G_GNUC_INTERNAL
+const gchar *_mcd_channel_get_request_path (McdChannel *channel);
+G_GNUC_INTERNAL
+const GList *_mcd_channel_get_satisfied_requests (McdChannel *channel);
+G_GNUC_INTERNAL
+guint64 _mcd_channel_get_request_user_action_time (McdChannel *channel);
+G_GNUC_INTERNAL
+const gchar *_mcd_channel_get_request_preferred_handler (McdChannel *channel);
+G_GNUC_INTERNAL
+gboolean _mcd_channel_get_request_use_existing (McdChannel *channel);
+
+G_GNUC_INTERNAL gboolean _mcd_channel_request_cancel (McdChannel *self,
+ GError **error);
+
+G_GNUC_INTERNAL
+void _mcd_channel_copy_details (McdChannel *channel, McdChannel *source);
+G_GNUC_INTERNAL
+void _mcd_channel_set_request_proxy (McdChannel *channel, McdChannel *source);
+
+G_END_DECLS
+#endif
+
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 4af6b28..b6c9663 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -34,6 +34,8 @@
* FIXME
*/
+#include "mcd-channel.h"
+
#include <glib/gi18n.h>
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/gtypes.h>
@@ -43,7 +45,7 @@
#include "mcd-account-priv.h"
#include "mcd-account-requests.h"
-#include "mcd-channel.h"
+#include "mcd-channel-priv.h"
#include "mcd-enum-types.h"
#include "_gen/gtypes.h"
#include "_gen/interfaces.h"
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index 87678bc..b92f39d 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -104,16 +104,6 @@ McdChannel *mcd_channel_new_request (McdAccount *account,
const gchar *preferred_handler,
gboolean use_existing,
gboolean proceeding);
-G_GNUC_INTERNAL McdChannel *_mcd_channel_new_undispatched (void);
-
-G_GNUC_INTERNAL
-gboolean _mcd_channel_create_proxy (McdChannel *channel,
- TpConnection *connection,
- const gchar *object_path,
- const GHashTable *properties);
-
-G_GNUC_INTERNAL
-void _mcd_channel_set_status (McdChannel *channel, McdChannelStatus status);
McdChannelStatus mcd_channel_get_status (McdChannel * channel);
gboolean mcd_channel_get_members_accepted (McdChannel *channel);
@@ -133,45 +123,5 @@ TpChannel *mcd_channel_get_tp_channel (McdChannel *channel);
void mcd_channel_take_error (McdChannel *channel, GError *error);
const GError *mcd_channel_get_error (McdChannel *channel);
-/* not exported: */
-G_GNUC_INTERNAL void _mcd_channel_undispatchable (McdChannel *self);
-
-G_GNUC_INTERNAL
-gboolean _mcd_channel_create_proxy_old (McdChannel *channel,
- TpConnection *connection,
- const gchar *object_path,
- const gchar *type, guint handle,
- TpHandleType handle_type);
-G_GNUC_INTERNAL
-GHashTable *_mcd_channel_get_immutable_properties (McdChannel *channel);
-
-G_GNUC_INTERNAL
-GPtrArray *_mcd_channel_details_build_from_list (GList *channels);
-G_GNUC_INTERNAL
-void _mcd_channel_details_free (GPtrArray *channels);
-
-G_GNUC_INTERNAL
-const gchar *_mcd_channel_get_target_id (McdChannel *channel);
-G_GNUC_INTERNAL
-GHashTable *_mcd_channel_get_requested_properties (McdChannel *channel);
-G_GNUC_INTERNAL
-const gchar *_mcd_channel_get_request_path (McdChannel *channel);
-G_GNUC_INTERNAL
-const GList *_mcd_channel_get_satisfied_requests (McdChannel *channel);
-G_GNUC_INTERNAL
-guint64 _mcd_channel_get_request_user_action_time (McdChannel *channel);
-G_GNUC_INTERNAL
-const gchar *_mcd_channel_get_request_preferred_handler (McdChannel *channel);
-G_GNUC_INTERNAL
-gboolean _mcd_channel_get_request_use_existing (McdChannel *channel);
-
-G_GNUC_INTERNAL gboolean _mcd_channel_request_cancel (McdChannel *self,
- GError **error);
-
-G_GNUC_INTERNAL
-void _mcd_channel_copy_details (McdChannel *channel, McdChannel *source);
-G_GNUC_INTERNAL
-void _mcd_channel_set_request_proxy (McdChannel *channel, McdChannel *source);
-
G_END_DECLS
#endif /* MCD_CHANNEL_H */
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 6ed398b..39cab7a 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -56,6 +56,7 @@
#include <libmcclient/mc-errors.h>
#include "mcd-account-priv.h"
+#include "mcd-channel-priv.h"
#include "mcd-connection-priv.h"
#include "mcd-account-connection.h"
#include "mcd-channel.h"
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 94e66eb..97f965c 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -36,6 +36,7 @@
#include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/util.h>
+#include "mcd-channel-priv.h"
#include "mcd-dbusprop.h"
#include "mcd-misc.h"
#include "_gen/interfaces.h"
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index d1058b6..ba08e74 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -49,6 +49,7 @@
#include "mcd-channel.h"
#include "mcd-master.h"
#include "mcd-chan-handler.h"
+#include "mcd-channel-priv.h"
#include "mcd-dispatcher-context.h"
#include "mcd-dispatch-operation.h"
#include "mcd-misc.h"
--
1.5.6.5
More information about the telepathy-commits
mailing list