# HG changeset patch # User Mike Ruprecht # Date 1237602309 0 # Node ID 8c21dbe149d87065c2ec7ec15c6eeff831f4bdf4 # Parent 31236ac583ef4f97b1e06606b17a681ac4dcb9d6 Remove rejected and hangup states from state-changed. diff -r 31236ac583ef -r 8c21dbe149d8 libpurple/media.c --- a/libpurple/media.c Sat Mar 21 01:37:50 2009 +0000 +++ b/libpurple/media.c Sat Mar 21 02:25:09 2009 +0000 @@ -1406,9 +1406,6 @@ purple_media_hangup(PurpleMedia *media) { g_return_if_fail(PURPLE_IS_MEDIA(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[STREAM_INFO], 0, PURPLE_MEDIA_INFO_HANGUP, NULL, NULL); @@ -1419,9 +1416,6 @@ purple_media_reject(PurpleMedia *media) { g_return_if_fail(PURPLE_IS_MEDIA(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[STREAM_INFO], 0, PURPLE_MEDIA_INFO_REJECT, NULL, NULL); diff -r 31236ac583ef -r 8c21dbe149d8 libpurple/media.h --- a/libpurple/media.h Sat Mar 21 01:37:50 2009 +0000 +++ b/libpurple/media.h Sat Mar 21 02:25:09 2009 +0000 @@ -92,8 +92,6 @@ typedef enum { PURPLE_MEDIA_STATE_CHANGED_NEW = 0, PURPLE_MEDIA_STATE_CHANGED_CONNECTED, - PURPLE_MEDIA_STATE_CHANGED_REJECTED, /** Local user rejected the stream. */ - PURPLE_MEDIA_STATE_CHANGED_HANGUP, /** Local user hung up the stream */ PURPLE_MEDIA_STATE_CHANGED_END, } PurpleMediaStateChangedType;