Mercurial > pidgin
comparison libpurple/media.c @ 26045:62b41bb71a60
merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff'
and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 13 Jan 2009 09:00:57 +0000 |
parents | b04508e5cc6c 8b16e5fcaa32 |
children | fc921eb8b220 |
comparison
equal
deleted
inserted
replaced
26044:b04508e5cc6c | 26045:62b41bb71a60 |
---|---|
1311 | 1311 |
1312 void | 1312 void |
1313 purple_media_hangup(PurpleMedia *media) | 1313 purple_media_hangup(PurpleMedia *media) |
1314 { | 1314 { |
1315 g_signal_emit(media, purple_media_signals[STATE_CHANGED], | 1315 g_signal_emit(media, purple_media_signals[STATE_CHANGED], |
1316 0, PURPLE_MEDIA_STATE_CHANGED_HANGUP, | |
1317 NULL, NULL); | |
1318 g_signal_emit(media, purple_media_signals[STATE_CHANGED], | |
1316 0, PURPLE_MEDIA_STATE_CHANGED_END, | 1319 0, PURPLE_MEDIA_STATE_CHANGED_END, |
1317 NULL, NULL); | 1320 NULL, NULL); |
1318 g_signal_emit(media, purple_media_signals[HANGUP], 0); | 1321 g_signal_emit(media, purple_media_signals[HANGUP], 0); |
1319 } | 1322 } |
1320 | 1323 |
1321 void | 1324 void |
1322 purple_media_reject(PurpleMedia *media) | 1325 purple_media_reject(PurpleMedia *media) |
1323 { | 1326 { |
1327 g_signal_emit(media, purple_media_signals[STATE_CHANGED], | |
1328 0, PURPLE_MEDIA_STATE_CHANGED_REJECTED, | |
1329 NULL, NULL); | |
1324 g_signal_emit(media, purple_media_signals[STATE_CHANGED], | 1330 g_signal_emit(media, purple_media_signals[STATE_CHANGED], |
1325 0, PURPLE_MEDIA_STATE_CHANGED_END, | 1331 0, PURPLE_MEDIA_STATE_CHANGED_END, |
1326 NULL, NULL); | 1332 NULL, NULL); |
1327 g_signal_emit(media, purple_media_signals[REJECT], 0); | 1333 g_signal_emit(media, purple_media_signals[REJECT], 0); |
1328 } | 1334 } |
1334 } | 1340 } |
1335 | 1341 |
1336 void | 1342 void |
1337 purple_media_got_hangup(PurpleMedia *media) | 1343 purple_media_got_hangup(PurpleMedia *media) |
1338 { | 1344 { |
1339 /* | |
1340 * There's no way to tell who hung up with the new structure. | |
1341 * I'm commenting this out until this is resolved. | |
1342 */ | |
1343 #if 0 | |
1344 g_signal_emit(media, purple_media_signals[STATE_CHANGED], | 1345 g_signal_emit(media, purple_media_signals[STATE_CHANGED], |
1345 0, PURPLE_MEDIA_STATE_CHANGED_END, | 1346 0, PURPLE_MEDIA_STATE_CHANGED_END, |
1346 NULL, NULL); | 1347 NULL, NULL); |
1347 #endif | |
1348 g_signal_emit(media, purple_media_signals[GOT_HANGUP], 0); | 1348 g_signal_emit(media, purple_media_signals[GOT_HANGUP], 0); |
1349 } | 1349 } |
1350 | 1350 |
1351 void | 1351 void |
1352 purple_media_got_accept(PurpleMedia *media) | 1352 purple_media_got_accept(PurpleMedia *media) |