diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2015-05-06 02:57:03 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2015-05-06 02:57:03 -0400 |
| commit | 4c67a4a6e63c01775e0975c484911d31175ca908 (patch) | |
| tree | 47bfee946fd31169b5d7d6ee17f66f0e9c9cf2c6 /libpurple/media.c | |
| parent | e48d473e84357b312dbfa43c4ae7b7358460a794 (diff) | |
| download | pidgin-4c67a4a6e63c01775e0975c484911d31175ca908.tar.gz | |
Fix media compile against new protocol plugin interface.
Diffstat (limited to 'libpurple/media.c')
| -rw-r--r-- | libpurple/media.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libpurple/media.c b/libpurple/media.c index fffc8c5bae..56448118a8 100644 --- a/libpurple/media.c +++ b/libpurple/media.c @@ -1477,8 +1477,7 @@ purple_media_send_dtmf(PurpleMedia *media, const gchar *session_id, #ifdef USE_VV PurpleAccount *account = NULL; PurpleConnection *gc = NULL; - PurplePlugin *prpl = NULL; - PurplePluginProtocolInfo *prpl_info = NULL; + PurpleProtocol *protocol = NULL; PurpleMediaBackendIface *backend_iface = NULL; if (media) @@ -1489,9 +1488,7 @@ purple_media_send_dtmf(PurpleMedia *media, const gchar *session_id, if (account) gc = purple_account_get_connection(account); if (gc) - prpl = purple_connection_get_prpl(gc); - if (prpl) - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); + protocol = purple_connection_get_protocol(gc); if (dtmf == 'a') dtmf = 'A'; @@ -1504,8 +1501,8 @@ purple_media_send_dtmf(PurpleMedia *media, const gchar *session_id, g_return_val_if_fail(strchr("0123456789ABCD#*", dtmf), FALSE); - if (prpl_info && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, media_send_dtmf) - && prpl_info->media_send_dtmf(media, dtmf, volume, duration)) + if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, MEDIA_IFACE, send_dtmf) + && purple_protocol_media_iface_send_dtmf(protocol, media, dtmf, volume, duration)) { return TRUE; } else if (backend_iface && backend_iface->send_dtmf |