Mercurial > pidgin.yaz

comparison libpurple/media.c @ 26142:5b64b7d8da39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added the accepted signal.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 27 Jan 2009 09:40:24 +0000
parents 1ff5304f6e9d
children f6a98b2b8d92
comparison
equal deleted inserted replaced
26141:1ff5304f6e9d 26142:5b64b7d8da39
116 116
117 117
118 118
119 enum { 119 enum {
120 ERROR, 120 ERROR,
121 ACCEPTED,
121 CODECS_CHANGED, 122 CODECS_CHANGED,
122 NEW_CANDIDATE, 123 NEW_CANDIDATE,
123 READY_NEW, 124 READY_NEW,
124 STATE_CHANGED, 125 STATE_CHANGED,
125 LAST_SIGNAL 126 LAST_SIGNAL
198 199
199 purple_media_signals[ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass), 200 purple_media_signals[ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass),
200 G_SIGNAL_RUN_LAST, 0, NULL, NULL, 201 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
201 g_cclosure_marshal_VOID__STRING, 202 g_cclosure_marshal_VOID__STRING,
202 G_TYPE_NONE, 1, G_TYPE_STRING); 203 G_TYPE_NONE, 1, G_TYPE_STRING);
204 purple_media_signals[ACCEPTED] = g_signal_new("accepted", G_TYPE_FROM_CLASS(klass),
205 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
206 purple_smarshal_VOID__STRING_STRING,
207 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
203 purple_media_signals[CODECS_CHANGED] = g_signal_new("codecs-changed", G_TYPE_FROM_CLASS(klass), 208 purple_media_signals[CODECS_CHANGED] = g_signal_new("codecs-changed", G_TYPE_FROM_CLASS(klass),
204 G_SIGNAL_RUN_LAST, 0, NULL, NULL, 209 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
205 g_cclosure_marshal_VOID__STRING, 210 g_cclosure_marshal_VOID__STRING,
206 G_TYPE_NONE, 1, G_TYPE_STRING); 211 G_TYPE_NONE, 1, G_TYPE_STRING);
207 purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass), 212 purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass),
1230 1235
1231 if (media->priv->initiator == FALSE) 1236 if (media->priv->initiator == FALSE)
1232 purple_media_emit_ready(media, session, NULL); 1237 purple_media_emit_ready(media, session, NULL);
1233 } 1238 }
1234 1239
1240 g_signal_emit(media, purple_media_signals[ACCEPTED],
1241 0, NULL, NULL);
1235 streams = media->priv->streams; 1242 streams = media->priv->streams;
1236 1243
1237 for (; streams; streams = g_list_next(streams)) { 1244 for (; streams; streams = g_list_next(streams)) {
1238 PurpleMediaStream *stream = streams->data; 1245 PurpleMediaStream *stream = streams->data;
1239 g_object_set(G_OBJECT(stream->stream), "direction", 1246 g_object_set(G_OBJECT(stream->stream), "direction",