pidgin: 2edeee59: Adapt Pidgin's incoming call dialog beha...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 2edeee590d14962edb92c1ae9b44f28f0fbfde7a
Parent:   b4483070b354d952ab54dc0468ca2376fe04a8d6
Author:   jakub.adam at ktknet.cz
Date:     03/24/11 19:39:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2edeee590d14962edb92c1ae9b44f28f0fbfde7a

Changelog: 

Adapt Pidgin's incoming call dialog behavior so that rejecting the addition of a
stream to an active call doesn't kill the existing call.

Changes against parent b4483070b354d952ab54dc0468ca2376fe04a8d6

  patched  pidgin/gtkmedia.c

-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c	fbc100d40c6e1227ffb3fe084db12556fe1de429
+++ pidgin/gtkmedia.c	2dfb8b4535e7163815545f472eef8db5a39c8d70
@@ -595,8 +595,13 @@ pidgin_media_reject_cb(PurpleMedia *medi
 static void
 pidgin_media_reject_cb(PurpleMedia *media, int index)
 {
-	purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
-			NULL, NULL, TRUE);
+	GList *iter = purple_media_get_session_ids(media);
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		const gchar *sessionid = iter->data;
+		if (!purple_media_accepted(media, sessionid, NULL))
+			purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT,
+					sessionid, NULL, TRUE);
+	}
 }
 
 static gboolean