pidgin.vv: cfe93146: Add candidates-prepared signal to Purple...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: cfe931468e3dd34ffe4c1d9368d4da9b8dbc2413
Ancestor: 7fa60e1842ef326bd798c2bd89fc2af48aa278f7
Author: maiku at soc.pidgin.im
Date: 2009-03-19T09:30:16
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/cfe931468e3dd34ffe4c1d9368d4da9b8dbc2413

Modified files:
        libpurple/media.c libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

Add candidates-prepared signal to PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media.c	e95d3f4909d09d90e09d15c7a9e32eb116166a82
+++ libpurple/media.c	81b0ab000d4b97a5967103ff3c5141b92d1f91c1
@@ -126,6 +126,7 @@ enum {
 enum {
 	ERROR,
 	ACCEPTED,
+	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
 	NEW_CANDIDATE,
 	READY_NEW,
@@ -234,6 +235,11 @@ purple_media_class_init (PurpleMediaClas
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__STRING_STRING,
 					 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+	purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__STRING_STRING,
+					 G_TYPE_NONE, 2, G_TYPE_STRING,
+					 G_TYPE_STRING);
 	purple_media_signals[CODECS_CHANGED] = g_signal_new("codecs-changed", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
@@ -1724,6 +1730,10 @@ purple_media_candidates_prepared_cb(FsSt
 	stream_data = purple_media_get_stream(session->media, session->id, name);
 	stream_data->candidates_prepared = TRUE;
 
+	g_signal_emit(session->media,
+			purple_media_signals[CANDIDATES_PREPARED],
+			0, session->id, name);
+
 	purple_media_emit_ready(session->media, session, name);
 	g_free(name);
 }
============================================================
--- libpurple/protocols/jabber/jingle/rtp.c	f806d8bdc3a2ec57c2de98aa22b6e58d992bc4e8
+++ libpurple/protocols/jabber/jingle/rtp.c	3cb148ddc4b12ca143e58d171a73259186bfe5a9
@@ -343,6 +343,12 @@ static void
 }
 
 static void
+jingle_rtp_candidates_prepared_cb(PurpleMedia *media, gchar *sid, gchar *name)
+{
+	purple_debug_info("jingle-rtp", "jingle_rtp_candidates_prepared_cb\n");
+}
+
+static void
 jingle_rtp_codecs_changed_cb(PurpleMedia *media, gchar *sid,
 		JingleSession *session)
 {
@@ -473,6 +479,8 @@ jingle_rtp_create_media(JingleContent *c
 	/* connect callbacks */
 	g_signal_connect(G_OBJECT(media), "accepted",
 				 G_CALLBACK(jingle_rtp_accepted_cb), session);
+	g_signal_connect(G_OBJECT(media), "candidates-prepared",
+				 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
 	g_signal_connect(G_OBJECT(media), "codecs-changed",
 				 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
 	g_signal_connect(G_OBJECT(media), "ready-new",