Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/media.c Mon Jan 12 19:27:55 2009 +0000 +++ b/libpurple/media.c Tue Jan 13 09:00:57 2009 +0000 @@ -1313,6 +1313,9 @@ purple_media_hangup(PurpleMedia *media) { g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_CHANGED_HANGUP, + NULL, NULL); + g_signal_emit(media, purple_media_signals[STATE_CHANGED], 0, PURPLE_MEDIA_STATE_CHANGED_END, NULL, NULL); g_signal_emit(media, purple_media_signals[HANGUP], 0); @@ -1322,6 +1325,9 @@ purple_media_reject(PurpleMedia *media) { g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_CHANGED_REJECTED, + NULL, NULL); + g_signal_emit(media, purple_media_signals[STATE_CHANGED], 0, PURPLE_MEDIA_STATE_CHANGED_END, NULL, NULL); g_signal_emit(media, purple_media_signals[REJECT], 0); @@ -1336,15 +1342,9 @@ void purple_media_got_hangup(PurpleMedia *media) { -/* - * There's no way to tell who hung up with the new structure. - * I'm commenting this out until this is resolved. - */ -#if 0 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 0, PURPLE_MEDIA_STATE_CHANGED_END, NULL, NULL); -#endif g_signal_emit(media, purple_media_signals[GOT_HANGUP], 0); }