[telepathy-mission-control/master] mcd_dispatcher_context_get_protocol_name: remove deprecated method
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Oct 19 08:10:27 PDT 2009
---
src/mcd-dispatcher-context.h | 2 --
src/mcd-dispatcher.c | 19 -------------------
2 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/src/mcd-dispatcher-context.h b/src/mcd-dispatcher-context.h
index a0fc9c6..4f2f6b3 100644
--- a/src/mcd-dispatcher-context.h
+++ b/src/mcd-dispatcher-context.h
@@ -108,8 +108,6 @@ void mcd_dispatcher_context_proceed (McdDispatcherContext *context);
void mcd_dispatcher_context_process (McdDispatcherContext * ctx, gboolean result);
-const gchar *mcd_dispatcher_context_get_protocol_name (McdDispatcherContext *) G_GNUC_DEPRECATED;
-
G_END_DECLS
#endif
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index e761a90..df64954 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -132,8 +132,6 @@ struct _McdDispatcherContext
* One instance of CTXREF06 is held for each pending approver. */
gsize approvers_pending;
- gchar *protocol;
-
/* State-machine internal data fields: */
GList *chain;
@@ -2191,7 +2189,6 @@ mcd_dispatcher_context_unref (McdDispatcherContext * context,
priv = MCD_DISPATCHER_PRIV (context->dispatcher);
priv->contexts = g_list_remove (priv->contexts, context);
- g_free (context->protocol);
g_free (context);
}
}
@@ -2372,22 +2369,6 @@ _mcd_dispatcher_get_channel_enhanced_capabilities (McdDispatcher *dispatcher)
return caps;
}
-const gchar *
-mcd_dispatcher_context_get_protocol_name (McdDispatcherContext *context)
-{
- McdConnection *conn;
- McdAccount *account;
-
- if (!context->protocol)
- {
- conn = mcd_dispatcher_context_get_connection (context);
- account = mcd_connection_get_account (conn);
- context->protocol = g_strdup (mcd_account_get_protocol_name (account));
- }
-
- return context->protocol;
-}
-
static void
remove_request_data_free (McdRemoveRequestData *rrd)
{
--
1.5.6.5
More information about the telepathy-commits
mailing list