[telepathy-mission-control/master] McdMaster: remove more unused methods
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Apr 2 13:34:49 PDT 2009
* mcd_master_set_default_presence
* mcd_master_get_account_status
* mcd_master_get_online_connection_names
* mcd_master_get_account_connection_details
* mcd_master_get_account_for_connection
* mcd_master_new (a #define for mcd_master_get_default)
---
src/mcd-master.c | 210 ------------------------------------------------------
src/mcd-master.h | 21 ------
2 files changed, 0 insertions(+), 231 deletions(-)
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 2e1e6d8..58131d5 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -334,14 +334,6 @@ mcd_master_load_plugins (McdMaster *master)
g_dir_close (dir);
}
-static TpConnectionPresenceType
-_get_default_presence (McdMasterPrivate *priv)
-{
- TpConnectionPresenceType presence = priv->default_presence;
-
- return presence;
-}
-
static DBusHandlerResult
dbus_filter_func (DBusConnection *connection,
DBusMessage *message,
@@ -765,208 +757,6 @@ mcd_master_get_default (void)
return default_master;
}
-static void
-mcd_master_set_offline_on_idle (McdMaster *master, gboolean offline_on_idle)
-{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
-
- DEBUG ("setting offline_on_idle to %d", offline_on_idle);
- priv->offline_on_idle = offline_on_idle;
-}
-
-gboolean
-mcd_master_set_default_presence (McdMaster * master, const gchar *client_id)
-{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
- TpConnectionPresenceType presence;
-
- presence = _get_default_presence (priv);
- if (presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
- return FALSE;
-
- if (client_id)
- {
- if (g_hash_table_lookup (priv->clients_needing_presence, client_id) == NULL)
- {
- DEBUG ("New process requesting default presence (%s)", client_id);
- g_hash_table_insert (priv->clients_needing_presence,
- g_strdup (client_id), GINT_TO_POINTER(1));
- }
- }
-
- if (mcd_presence_frame_get_actual_presence (priv->presence_frame)
- >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE ||
- !mcd_presence_frame_is_stable (priv->presence_frame) ||
- /* if we are not connected the presence frame will always be stable,
- * but this doesn't mean we must accept this request; maybe another one
- * is pending */
- (!mcd_mission_is_connected (MCD_MISSION (master)) &&
- mcd_presence_frame_get_requested_presence (priv->presence_frame)
- >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE))
- {
- DEBUG ("Default presence requested while connected or "
- "already connecting");
- return FALSE;
- }
- mcd_master_set_offline_on_idle (master, TRUE);
- mcd_presence_frame_request_presence (priv->presence_frame, presence, NULL);
- return TRUE;
-}
-
-TpConnectionStatus
-mcd_master_get_account_status (McdMaster * master, gchar * account_name)
-{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
- TpConnectionStatus status;
- McdAccount *account;
-
- account = mcd_account_manager_lookup_account (priv->account_manager,
- account_name);
- if (account)
- {
- status = mcd_account_get_connection_status (account);
- }
- else
- status = TP_CONNECTION_STATUS_DISCONNECTED;
- return status;
-}
-
-gboolean
-mcd_master_get_online_connection_names (McdMaster * master,
- gchar *** connected_names)
-{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
- GList *account_list, *account_node;
- GPtrArray *names = g_ptr_array_new ();
-
- account_list = mcd_presence_frame_get_accounts (priv->presence_frame);
- for (account_node = account_list; account_node != NULL;
- account_node = account_node->next)
- {
- McdAccount *account = account_node->data;
-
-
- if (mcd_account_get_connection_status (account) ==
- TP_CONNECTION_STATUS_CONNECTED)
- {
- g_ptr_array_add (names,
- g_strdup (mcd_account_get_unique_name (account)));
- }
- }
-
- if (names->len != 0)
- {
- guint i;
-
- /* Copy the collected names to the array of strings */
- *connected_names =
- (gchar **) g_malloc0 (sizeof (gchar *) * (names->len + 1));
- for (i = 0; i < names->len; i++)
- {
- *(*connected_names + i) = g_ptr_array_index (names, i);
- }
- (*connected_names)[i] = NULL;
- }
- g_ptr_array_free (names, TRUE);
- return TRUE;
-}
-
-gboolean
-mcd_master_get_account_connection_details (McdMaster * master,
- const gchar * account_name,
- gchar ** servname, gchar ** objpath,
- GError **error)
-{
- McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
- McdConnection *connection;
- McdAccount *account;
-
- account = mcd_account_manager_lookup_account (priv->account_manager,
- account_name);
- if (!account)
- {
- if (error)
- g_set_error (error, MC_ERROR, MC_INVALID_ACCOUNT_ERROR,
- "No such account %s", account_name);
- return FALSE;
- }
-
- connection = mcd_account_get_connection (account);
- if (!connection)
- {
- if (error)
- g_set_error (error, MC_ERROR, MC_NO_MATCHING_CONNECTION_ERROR,
- "Account %s is not connected", account_name);
- return FALSE;
- }
- return mcd_connection_get_telepathy_details (connection,
- servname, objpath);
-}
-
-static McdConnection *
-mcd_master_get_connection (McdMaster *master, const gchar *object_path,
- GError **error)
-{
- McdConnection *connection;
- const GList *managers, *node;
-
- g_return_val_if_fail (MCD_IS_MASTER (master), NULL);
-
- managers = mcd_operation_get_missions (MCD_OPERATION (master));
-
- /* MC exits if there aren't any accounts */
- if (managers == NULL)
- {
- if (error)
- {
- g_set_error (error, MC_ERROR, MC_NO_ACCOUNTS_ERROR,
- "No accounts configured");
- }
- mcd_controller_shutdown (MCD_CONTROLLER (master),
- "No accounts configured");
- return NULL;
- }
-
- node = managers;
- while (node)
- {
- connection = mcd_manager_get_connection (MCD_MANAGER (node->data),
- object_path);
- if (connection)
- return connection;
- node = node->next;
- }
-
- /* Manager not found */
- if (error)
- {
- g_set_error (error, MC_ERROR, MC_NO_MATCHING_CONNECTION_ERROR,
- "No matching manager found for connection '%s'",
- object_path);
- }
- return NULL;
-}
-
-gboolean
-mcd_master_get_account_for_connection (McdMaster *master,
- const gchar *object_path,
- gchar **ret_unique_name,
- GError **error)
-{
- McdConnection *connection;
- McdAccount *account;
-
- connection = mcd_master_get_connection (master, object_path, error);
- if (connection &&
- (account = mcd_connection_get_account (connection)))
- {
-
- *ret_unique_name = g_strdup (mcd_account_get_unique_name (account));
- return TRUE;
- }
- return FALSE;
-}
-
void
mcd_master_set_default_presence_setting (McdMaster *master,
TpConnectionPresenceType presence)
diff --git a/src/mcd-master.h b/src/mcd-master.h
index 52abbad..192c0fb 100644
--- a/src/mcd-master.h
+++ b/src/mcd-master.h
@@ -64,7 +64,6 @@ struct _McdMasterClass
};
GType mcd_master_get_type (void);
-#define mcd_master_new() mcd_master_get_default()
McdMaster *mcd_master_get_default (void);
McdManager *mcd_master_lookup_manager (McdMaster *master,
@@ -72,29 +71,9 @@ McdManager *mcd_master_lookup_manager (McdMaster *master,
McdDispatcher *mcd_master_get_dispatcher (McdMaster *master);
TpDBusDaemon *mcd_master_get_dbus_daemon (McdMaster *master);
-gboolean mcd_master_set_default_presence (McdMaster * master,
- const gchar *client_id);
-
void mcd_master_set_default_presence_setting (McdMaster *master,
TpConnectionPresenceType presence);
-TpConnectionStatus mcd_master_get_account_status (McdMaster * master,
- gchar * account_name);
-
-gboolean mcd_master_get_online_connection_names (McdMaster * master,
- gchar *** connected_names);
-
-gboolean mcd_master_get_account_connection_details (McdMaster * master,
- const gchar * account_name,
- gchar ** servname,
- gchar ** objpath,
- GError **error);
-
-gboolean mcd_master_get_account_for_connection (McdMaster *master,
- const gchar *object_path,
- gchar **ret_unique_name,
- GError **error);
-
void mcd_master_add_connection_parameter (McdMaster *master, const gchar *name,
const GValue *value);
--
1.5.6.5
More information about the telepathy-commits
mailing list