maiku.vv: 9b5648cb: purple_media_add_stream should only add ...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 9b5648cbd3137d2757685cdacb98392b442ae309
Ancestor: e4b6799c5bed01a69c70386b75a8f00c003e6713
Author: maiku at soc.pidgin.im
Date: 2008-09-01T01:58:42
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/9b5648cbd3137d2757685cdacb98392b442ae309

Modified files:
        libpurple/media.c libpurple/media.h

ChangeLog: 

purple_media_add_stream should only add a stream to one session.
Also clarified documentation.

-------------- next part --------------
============================================================
--- libpurple/media.c	fcc12741590b916e6455be8372619260cea880ee
+++ libpurple/media.c	9f46e60aab5a966d87b9651d9b5bfda608fb0eec
@@ -1180,7 +1180,7 @@ purple_media_add_stream(PurpleMedia *med
 			return FALSE;
 		}
 	}
-	if (type & PURPLE_MEDIA_VIDEO) {
+	else if (type & PURPLE_MEDIA_VIDEO) {
 		type_direction = purple_media_to_fs_stream_direction(type & PURPLE_MEDIA_VIDEO);
 
 		if (!purple_media_add_stream_internal(media, sess_id, who,
============================================================
--- libpurple/media.h	c62b9f27f8dc417074f5bc7ec93a83c0de1ffc05
+++ libpurple/media.h	bbb2dc85a1c2c66e024b7172db6100016297d3e1
@@ -336,11 +336,16 @@ void purple_media_video_init_recv(GstEle
 /**
  * Adds a stream to a session.
  *
+ * It only adds a stream to one audio session or video session as
+ * the @c sess_id must be unique between sessions.
+ *
  * @param media The media object to find the session in.
  * @param sess_id The session id of the session to add the stream to.
  * @param who The name of the remote user to add the stream for.
  * @param type The type of stream to create.
  * @param transmitter The transmitter to use for the stream.
+ * @param num_params The number of parameters to pass to Farsight.
+ * @param params The parameters to pass to Farsight.
  *
  * @return @c TRUE The stream was added successfully, @c FALSE otherwise.
  */