changeset 28042:60aab59fb35a

Make media.c compilable on Windows following guidance from Maiku
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 28 Jul 2009 01:16:09 +0000
parents bd3cf895e19a
children 6e3c83e1057c
files libpurple/media.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media.c	Mon Jul 27 19:11:49 2009 +0000
+++ b/libpurple/media.c	Tue Jul 28 01:16:09 2009 +0000
@@ -156,7 +156,7 @@
 
 
 enum {
-	ERROR,
+	S_ERROR,
 	ACCEPTED,
 	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
@@ -328,7 +328,7 @@
 			"Data the prpl plugin set on the media session.",
 			G_PARAM_READWRITE));
 
-	purple_media_signals[ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass),
+	purple_media_signals[S_ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -2110,7 +2110,7 @@
 	va_end(args);
 
 	purple_debug_error("media", "%s\n", message);
-	g_signal_emit(media, purple_media_signals[ERROR], 0, message);
+	g_signal_emit(media, purple_media_signals[S_ERROR], 0, message);
 
 	g_free(message);
 #endif