[telepathy-mission-control/master] McdAccount: move private functions to mcd-account-priv.h
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Apr 15 04:56:28 PDT 2009
If they shouldn't be used outside this library, then they should only be
declared in a header we don't install.
---
src/mcd-account-manager-query.c | 1 +
src/mcd-account-manager.c | 1 +
src/mcd-account-priv.h | 53 ++++++++++++++++++++++++++++++++++++++-
src/mcd-account.h | 44 --------------------------------
src/mcd-connection.c | 1 +
5 files changed, 55 insertions(+), 45 deletions(-)
diff --git a/src/mcd-account-manager-query.c b/src/mcd-account-manager-query.c
index 17db277..e4c6f06 100644
--- a/src/mcd-account-manager-query.c
+++ b/src/mcd-account-manager-query.c
@@ -35,6 +35,7 @@
#include "mcd-account.h"
#include "mcd-account-manager.h"
#include "mcd-account-manager-query.h"
+#include "mcd-account-priv.h"
#include "_gen/interfaces.h"
typedef struct
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 04c9687..863a8fc 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -38,6 +38,7 @@
#include "mcd-account-manager-creation.h"
#include "mcd-account.h"
#include "mcd-account-config.h"
+#include "mcd-account-priv.h"
#include "mcd-dbusprop.h"
#include "mcd-misc.h"
#include "_gen/interfaces.h"
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index a1d9b4f..2db29dc 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -26,6 +26,7 @@
#ifndef __MCD_ACCOUNT_PRIV_H__
#define __MCD_ACCOUNT_PRIV_H__
+#include "mcd-account.h"
#include "mcd-account-config.h"
enum
@@ -43,7 +44,57 @@ enum
extern guint _mcd_account_signals[LAST_SIGNAL];
-void _mcd_account_connect (McdAccount *account, GHashTable *params);
+G_GNUC_INTERNAL void _mcd_account_connect (McdAccount *account,
+ GHashTable *params);
+
+G_GNUC_INTERNAL gboolean _mcd_account_set_parameters (McdAccount *account,
+ GHashTable *params,
+ GError **error);
+G_GNUC_INTERNAL void _mcd_account_set_parameter (McdAccount *account,
+ const gchar *name,
+ const GValue *value);
+
+G_GNUC_INTERNAL void _mcd_account_set_current_presence (McdAccount *account,
+ TpConnectionPresenceType presence, const gchar *status,
+ const gchar *message);
+
+G_GNUC_INTERNAL void _mcd_account_request_temporary_presence (McdAccount *self,
+ TpConnectionPresenceType type, const gchar *status);
+
+G_GNUC_INTERNAL GKeyFile *_mcd_account_get_keyfile (McdAccount *account);
+
+G_GNUC_INTERNAL void _mcd_account_set_has_been_online (McdAccount *account);
+
+G_GNUC_INTERNAL void _mcd_account_set_normalized_name (McdAccount *account,
+ const gchar *name);
+
+G_GNUC_INTERNAL gboolean _mcd_account_set_avatar (McdAccount *account,
+ const GArray *avatar,
+ const gchar *mime_type,
+ const gchar *token,
+ GError **error);
+G_GNUC_INTERNAL void _mcd_account_get_avatar (McdAccount *account,
+ GArray **avatar,
+ gchar **mime_type);
+G_GNUC_INTERNAL void _mcd_account_set_avatar_token (McdAccount *account,
+ const gchar *token);
+G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_token (McdAccount *account);
+
+G_GNUC_INTERNAL void _mcd_account_set_alias (McdAccount *account,
+ const gchar *alias);
+
+G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_filename (McdAccount *account);
+
+G_GNUC_INTERNAL void _mcd_account_tp_connection_changed (McdAccount *account);
+
+G_GNUC_INTERNAL void _mcd_account_load (McdAccount *account,
+ McdAccountLoadCb callback,
+ gpointer user_data);
+G_GNUC_INTERNAL void _mcd_account_set_connection (McdAccount *account,
+ McdConnection *connection);
+
+G_GNUC_INTERNAL void _mcd_account_set_connection_status (McdAccount *account,
+ TpConnectionStatus status, TpConnectionStatusReason reason);
typedef void (*McdOnlineRequestCb) (McdAccount *account, gpointer userdata,
const GError *error);
diff --git a/src/mcd-account.h b/src/mcd-account.h
index b3c0054..c29669e 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -84,8 +84,6 @@ gboolean mcd_account_delete (McdAccount *account, GError **error);
const gchar *mcd_account_get_unique_name (McdAccount *account);
const gchar *mcd_account_get_object_path (McdAccount *account);
-G_GNUC_INTERNAL GKeyFile *_mcd_account_get_keyfile (McdAccount *account);
-
gboolean mcd_account_is_valid (McdAccount *account);
gboolean mcd_account_check_validity (McdAccount *account);
@@ -94,23 +92,14 @@ gboolean mcd_account_is_enabled (McdAccount *account);
const gchar *mcd_account_get_manager_name (McdAccount *account);
const gchar *mcd_account_get_protocol_name (McdAccount *account);
-G_GNUC_INTERNAL gboolean _mcd_account_set_parameters (McdAccount *account,
- GHashTable *params,
- GError **error);
GHashTable *mcd_account_get_parameters (McdAccount *account);
gboolean mcd_account_check_parameters (McdAccount *account);
-G_GNUC_INTERNAL void _mcd_account_set_parameter (McdAccount *account,
- const gchar *name,
- const GValue *value);
gboolean mcd_account_get_parameter (McdAccount *account, const gchar *name,
GValue *value);
void mcd_account_request_presence (McdAccount *account,
TpConnectionPresenceType type,
const gchar *status, const gchar *message);
-G_GNUC_INTERNAL void _mcd_account_set_current_presence (McdAccount *account,
- TpConnectionPresenceType presence, const gchar *status,
- const gchar *message);
void mcd_account_get_current_presence (McdAccount *account,
TpConnectionPresenceType *presence,
const gchar **status,
@@ -119,53 +108,20 @@ void mcd_account_get_requested_presence (McdAccount *account,
TpConnectionPresenceType *presence,
const gchar **status,
const gchar **message);
-G_GNUC_INTERNAL void _mcd_account_request_temporary_presence (McdAccount *self,
- TpConnectionPresenceType type, const gchar *status);
-G_GNUC_INTERNAL void _mcd_account_set_has_been_online (McdAccount *account);
gboolean mcd_account_get_connect_automatically (McdAccount *account);
void mcd_account_get_automatic_presence (McdAccount *account,
TpConnectionPresenceType *presence,
const gchar **status,
const gchar **message);
-G_GNUC_INTERNAL void _mcd_account_set_normalized_name (McdAccount *account,
- const gchar *name);
gchar *mcd_account_get_normalized_name (McdAccount *account);
-G_GNUC_INTERNAL gboolean _mcd_account_set_avatar (McdAccount *account,
- const GArray *avatar,
- const gchar *mime_type,
- const gchar *token,
- GError **error);
-G_GNUC_INTERNAL void _mcd_account_get_avatar (McdAccount *account,
- GArray **avatar,
- gchar **mime_type);
-G_GNUC_INTERNAL void _mcd_account_set_avatar_token (McdAccount *account,
- const gchar *token);
-G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_token (McdAccount *account);
-
-G_GNUC_INTERNAL void _mcd_account_set_alias (McdAccount *account,
- const gchar *alias);
-
gchar *mcd_account_get_alias (McdAccount *account);
-G_GNUC_INTERNAL void _mcd_account_set_connection_status (McdAccount *account,
- TpConnectionStatus status, TpConnectionStatusReason reason);
TpConnectionStatus mcd_account_get_connection_status (McdAccount *account);
TpConnectionStatusReason mcd_account_get_connection_status_reason (McdAccount *account);
McdConnection *mcd_account_get_connection (McdAccount *account);
-G_GNUC_INTERNAL gchar *_mcd_account_get_avatar_filename (McdAccount *account);
-
-/* non-exported methods */
-void _mcd_account_tp_connection_changed (McdAccount *account);
-
-G_GNUC_INTERNAL
-void _mcd_account_load (McdAccount *account, McdAccountLoadCb callback,
- gpointer user_data);
-G_GNUC_INTERNAL void _mcd_account_set_connection (McdAccount *account,
- McdConnection *connection);
-
#endif
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 5283fec..9e8ed0e 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -53,6 +53,7 @@
#include <telepathy-glib/proxy-subclass.h>
#include <libmcclient/mc-errors.h>
+#include "mcd-account-priv.h"
#include "mcd-connection.h"
#include "mcd-account-connection.h"
#include "mcd-channel.h"
--
1.5.6.5
More information about the telepathy-commits
mailing list