telepathy-mission-control: Account, AccountManager: remove various unused methods
Simon McVittie
smcv at kemper.freedesktop.org
Thu May 10 08:15:16 PDT 2012
Module: telepathy-mission-control
Branch: master
Commit: 25e12a0978aceccff2ce2a2bea6437404a627e44
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=25e12a0978aceccff2ce2a2bea6437404a627e44
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue May 8 13:22:06 2012 +0100
Account, AccountManager: remove various unused methods
---
src/mcd-account-manager.h | 2 -
src/mcd-account.c | 53 +--------------------------------------------
src/mcd-account.h | 12 ----------
3 files changed, 1 insertions(+), 66 deletions(-)
diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h
index 42d071e..3726a8c 100644
--- a/src/mcd-account-manager.h
+++ b/src/mcd-account-manager.h
@@ -72,8 +72,6 @@ McdAccountManager *mcd_account_manager_new (TpDBusDaemon *dbus_daemon);
TpDBusDaemon *mcd_account_manager_get_dbus_daemon
(McdAccountManager *account_manager);
-GKeyFile *mcd_account_manager_get_config (McdAccountManager *account_manager);
-
typedef void (McdAccountManagerWriteConfCb) (McdAccountManager *account_manager,
const GError *error,
gpointer user_data);
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 5aedce6..60b76e1 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -3213,13 +3213,6 @@ _mcd_account_get_storage (McdAccount *account)
return account->priv->storage;
}
-TpDBusDaemon *
-mcd_account_get_dbus_daemon (McdAccount *account)
-{
- return account->priv->dbus_daemon;
-}
-
-
/*
* mcd_account_is_valid:
* @account: the #McdAccount.
@@ -3457,13 +3450,6 @@ mcd_account_get_current_presence (McdAccount *account,
*message = priv->curr_presence_message;
}
-gboolean
-mcd_account_get_connect_automatically (McdAccount *account)
-{
- McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
- return priv->connect_automatically;
-}
-
/*
* mcd_account_would_like_to_connect:
* @account: an account
@@ -3511,25 +3497,6 @@ mcd_account_would_like_to_connect (McdAccount *account)
}
/* TODO: remove when the relative members will become public */
-void
-mcd_account_get_automatic_presence (McdAccount *account,
- TpConnectionPresenceType *presence,
- const gchar **status,
- const gchar **message)
-{
- McdAccountPrivate *priv = account->priv;
-
- if (presence != NULL)
- *presence = priv->auto_presence_type;
-
- if (status != NULL)
- *status = priv->auto_presence_status;
-
- if (message != NULL)
- *message = priv->auto_presence_message;
-}
-
-/* TODO: remove when the relative members will become public */
const gchar *
mcd_account_get_manager_name (McdAccount *account)
{
@@ -3589,17 +3556,6 @@ _mcd_account_set_normalized_name (McdAccount *account, const gchar *name)
g_value_unset (&value);
}
-gchar *
-mcd_account_get_normalized_name (McdAccount *account)
-{
- McdAccountPrivate *priv = account->priv;
- const gchar *account_name = mcd_account_get_unique_name (account);
-
- return mcd_storage_dup_string (priv->storage,
- account_name,
- MC_ACCOUNTS_KEY_NORMALIZED_NAME);
-}
-
void
_mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
{
@@ -3764,7 +3720,7 @@ mcd_account_connection_self_nickname_changed_cb (McdAccount *account,
g_value_unset (&value);
}
-gchar *
+static gchar *
mcd_account_get_alias (McdAccount *account)
{
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
@@ -4002,13 +3958,6 @@ mcd_account_get_connection_status (McdAccount *account)
return priv->conn_status;
}
-TpConnectionStatusReason
-mcd_account_get_connection_status_reason (McdAccount *account)
-{
- McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
- return priv->conn_reason;
-}
-
void
_mcd_account_tp_connection_changed (McdAccount *account,
TpConnection *tp_conn)
diff --git a/src/mcd-account.h b/src/mcd-account.h
index 6b0dd60..ea1a7cd 100644
--- a/src/mcd-account.h
+++ b/src/mcd-account.h
@@ -83,8 +83,6 @@ GType mcd_account_get_type (void);
McdAccount *mcd_account_new (McdAccountManager *account_manager,
const gchar *name);
-TpDBusDaemon *mcd_account_get_dbus_daemon (McdAccount *account);
-
void mcd_account_delete (McdAccount *account, McdAccountDeleteCb callback,
gpointer user_data);
@@ -118,19 +116,9 @@ void mcd_account_get_requested_presence (McdAccount *account,
const gchar **status,
const gchar **message);
-gboolean mcd_account_get_connect_automatically (McdAccount *account);
gboolean mcd_account_would_like_to_connect (McdAccount *account);
-void mcd_account_get_automatic_presence (McdAccount *account,
- TpConnectionPresenceType *presence,
- const gchar **status,
- const gchar **message);
-
-gchar *mcd_account_get_normalized_name (McdAccount *account);
-
-gchar *mcd_account_get_alias (McdAccount *account);
TpConnectionStatus mcd_account_get_connection_status (McdAccount *account);
-TpConnectionStatusReason mcd_account_get_connection_status_reason (McdAccount *account);
McdConnection *mcd_account_get_connection (McdAccount *account);
More information about the telepathy-commits
mailing list