pidgin: a2f9670f: Distinguish name and participant in Purp...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Tue Apr 28 17:21:58 EDT 2009
-----------------------------------------------------------------
Revision: a2f9670f976809bcdbf2ae07d587858efb4717c2
Ancestor: e6749b9134fe75c4907ed91f0e5df9a1c6f16d51
Author: darkrain42 at pidgin.im
Date: 2009-04-27T23:08:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a2f9670f976809bcdbf2ae07d587858efb4717c2
Modified files:
libpurple/media.c libpurple/media.h
ChangeLog:
Distinguish name and participant in PurpleMedia API
-------------- next part --------------
============================================================
--- libpurple/media.c 66f96142a56eff74397bc7e1c2c7b10a1280e889
+++ libpurple/media.c 55b23817c6b261667aef1715b41262d8f699e507
@@ -1850,7 +1850,7 @@ GList *
#endif
GList *
-purple_media_get_session_names(PurpleMedia *media)
+purple_media_get_session_ids(PurpleMedia *media)
{
#ifdef USE_VV
g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
@@ -2663,12 +2663,13 @@ GList *
}
GList *
-purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id, const gchar *name)
+purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id,
+ const gchar *participant)
{
#ifdef USE_VV
PurpleMediaStream *stream;
g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
- stream = purple_media_get_stream(media, sess_id, name);
+ stream = purple_media_get_stream(media, sess_id, participant);
return purple_media_candidate_list_from_fs(stream->local_candidates);
#else
return NULL;
@@ -2677,20 +2678,21 @@ purple_media_add_remote_candidates(Purpl
void
purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
- const gchar *name, GList *remote_candidates)
+ const gchar *participant,
+ GList *remote_candidates)
{
#ifdef USE_VV
PurpleMediaStream *stream;
GError *err = NULL;
g_return_if_fail(PURPLE_IS_MEDIA(media));
- stream = purple_media_get_stream(media, sess_id, name);
+ stream = purple_media_get_stream(media, sess_id, participant);
if (stream == NULL) {
purple_debug_error("media",
"purple_media_add_remote_candidates: "
"couldn't find stream %s %s.\n",
- sess_id, name);
+ sess_id, participant);
return;
}
@@ -2716,12 +2718,12 @@ purple_media_get_active_local_candidates
GList *
purple_media_get_active_local_candidates(PurpleMedia *media,
- const gchar *sess_id, const gchar *name)
+ const gchar *sess_id, const gchar *participant)
{
#ifdef USE_VV
PurpleMediaStream *stream;
g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
- stream = purple_media_get_stream(media, sess_id, name);
+ stream = purple_media_get_stream(media, sess_id, participant);
return purple_media_candidate_list_from_fs(
stream->active_local_candidates);
#else
@@ -2731,12 +2733,12 @@ purple_media_get_active_remote_candidate
GList *
purple_media_get_active_remote_candidates(PurpleMedia *media,
- const gchar *sess_id, const gchar *name)
+ const gchar *sess_id, const gchar *participant)
{
#ifdef USE_VV
PurpleMediaStream *stream;
g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL);
- stream = purple_media_get_stream(media, sess_id, name);
+ stream = purple_media_get_stream(media, sess_id, participant);
return purple_media_candidate_list_from_fs(
stream->active_remote_candidates);
#else
@@ -2746,7 +2748,8 @@ gboolean
#endif
gboolean
-purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id, const gchar *name, GList *codecs)
+purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
+ const gchar *participant, GList *codecs)
{
#ifdef USE_VV
PurpleMediaStream *stream;
@@ -2755,7 +2758,7 @@ purple_media_set_remote_codecs(PurpleMed
GError *err = NULL;
g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
- stream = purple_media_get_stream(media, sess_id, name);
+ stream = purple_media_get_stream(media, sess_id, participant);
if (stream == NULL)
return FALSE;
@@ -3029,7 +3032,7 @@ purple_media_remove_output_windows(Purpl
stream->session->id, stream->participant);
}
- iter = purple_media_get_session_names(media);
+ iter = purple_media_get_session_ids(media);
for (; iter; iter = g_list_delete_link(iter, iter)) {
gchar *session_name = iter->data;
purple_media_manager_remove_output_windows(
============================================================
--- libpurple/media.h c3df1ca1001cf1e9b293b752e3798d22d833eb14
+++ libpurple/media.h a35b9aa089df10452659a68600369139f4f7ca9d
@@ -351,15 +351,15 @@ void purple_media_codec_list_free(GList
void purple_media_codec_list_free(GList *codecs);
/**
- * Gets a list of session names.
+ * Gets a list of session IDs.
*
- * @param media The media session to retrieve session names from.
+ * @param media The media session from which to retrieve session IDs.
*
- * @return GList of session names.
+ * @return GList of session IDs. The caller must free the list.
*
* @since 2.6.0
*/
-GList *purple_media_get_session_names(PurpleMedia *media);
+GList *purple_media_get_session_ids(PurpleMedia *media);
/**
* Gets the PurpleAccount this media session is on.
@@ -495,14 +495,14 @@ GList *purple_media_get_codecs(PurpleMed
*
* @param media The media object to find the session in.
* @param sess_id The session id of the session find the stream in.
- * @param name The name of the remote user to add the candidates for.
+ * @param participant The name of the remote user to add the candidates for.
* @param remote_candidates The remote candidates to add.
*
* @since 2.6.0
*/
void purple_media_add_remote_candidates(PurpleMedia *media,
const gchar *sess_id,
- const gchar *name,
+ const gchar *participant,
GList *remote_candidates);
/**
@@ -510,13 +510,13 @@ void purple_media_add_remote_candidates(
*
* @param media The media object to find the session in.
* @param sess_id The session id of the session to find the stream in.
- * @param name The name of the remote user to get the candidates from.
+ * @param participant The name of the remote user to get the candidates from.
*
* @since 2.6.0
*/
GList *purple_media_get_local_candidates(PurpleMedia *media,
const gchar *sess_id,
- const gchar *name);
+ const gchar *participant);
#if 0
/*
@@ -529,24 +529,26 @@ GList *purple_media_get_local_candidates
*
* @param media The media object to find the session in.
* @param sess_id The session id of the session to find the stream in.
- * @param name The name of the remote user to get the active candidate from.
+ * @param participant The name of the remote user to get the active candidate
+ * from.
*
* @return The active candidates retrieved.
*/
GList *purple_media_get_active_local_candidates(PurpleMedia *media,
- const gchar *sess_id, const gchar *name);
+ const gchar *sess_id, const gchar *participant);
/**
* Gets the active remote candidates for the stream.
*
* @param media The media object to find the session in.
* @param sess_id The session id of the session to find the stream in.
- * @param name The name of the remote user to get the remote candidate from.
+ * @param participant The name of the remote user to get the remote candidate
+ * from.
*
* @return The remote candidates retrieved.
*/
GList *purple_media_get_active_remote_candidates(PurpleMedia *media,
- const gchar *sess_id, const gchar *name);
+ const gchar *sess_id, const gchar *participant);
#endif
/**
@@ -554,14 +556,14 @@ GList *purple_media_get_active_remote_ca
*
* @param media The media object to find the session in.
* @param sess_id The session id of the session find the stream in.
- * @param name The name of the remote user to get the candidates from.
+ * @param participant The name of the remote user to set the candidates from.
*
* @return @c TRUE The codecs were set successfully, or @c FALSE otherwise.
*
* @since 2.6.0
*/
gboolean purple_media_set_remote_codecs(PurpleMedia *media, const gchar *sess_id,
- const gchar *name, GList *codecs);
+ const gchar *participant, GList *codecs);
/**
* Returns whether or not the candidates for set of streams are prepared
More information about the Commits
mailing list