Mercurial > pidgin.yaz

diff libpurple/media.c @ 28176:584fa66dfb31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the "accepted" signal from PurpleMedia as it was redundant.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 05 Aug 2009 03:37:45 +0000
parents 813f2eb3fdc8
children c8ff0a9cf8cc
line wrap: on
line diff
--- a/libpurple/media.c	Wed Aug 05 02:17:12 2009 +0000
+++ b/libpurple/media.c	Wed Aug 05 03:37:45 2009 +0000
@@ -157,7 +157,6 @@
 
 enum {
 	S_ERROR,
-	ACCEPTED,
 	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
 	NEW_CANDIDATE,
@@ -332,10 +331,6 @@
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
-	purple_media_signals[ACCEPTED] = g_signal_new("accepted", G_TYPE_FROM_CLASS(klass),
-					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-					 purple_smarshal_VOID__STRING_STRING,
-					 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 	purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__STRING_STRING,
@@ -2155,9 +2150,6 @@
 					stream->session->type), NULL);
 			stream->accepted = TRUE;
 		}
-
-		g_signal_emit(media, purple_media_signals[ACCEPTED],
-				0, NULL, NULL);
 	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
 			type == PURPLE_MEDIA_INFO_UNMUTE)) {
 		GList *sessions;