pidgin.vv: ec0379e1: Remove rejected and hangup states from s...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: ec0379e12763e22647411c2b1ef8f0f145553cfd
Ancestor: da762c8bd62164ac653cf747bfab7a8686352f7c
Author: maiku at soc.pidgin.im
Date: 2009-03-21T02:25:09
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/ec0379e12763e22647411c2b1ef8f0f145553cfd

Modified files:
        libpurple/media.c libpurple/media.h

ChangeLog: 

Remove rejected and hangup states from state-changed.

-------------- next part --------------
============================================================
--- libpurple/media.c	c3345fc5c95f7238cf4f9703d3e7c4f8c56ce4b0
+++ libpurple/media.c	313edc232a2ea237deab6b26af2bb141e0ae0f2e
@@ -1406,9 +1406,6 @@ purple_media_hangup(PurpleMedia *media)
 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)
 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);
============================================================
--- libpurple/media.h	f5089c527e11047e35ea3a6fe72c40d3ab745ee9
+++ libpurple/media.h	00550594c4bb584af2de4f7d8f23b825ff7c0e9b
@@ -92,8 +92,6 @@ typedef enum {
 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;