pidgin: 18580114: Make media.c compilable on Windows follo...

nosnilmot at pidgin.im nosnilmot at pidgin.im
Mon Jul 27 21:20:44 EDT 2009


-----------------------------------------------------------------
Revision: 1858011415a1cac17e46a156ce1d9d5e8243ee26
Ancestor: dd1526faf6facf85e95bf0038da0760ffe613d5c
Author: nosnilmot at pidgin.im
Date: 2009-07-28T01:16:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1858011415a1cac17e46a156ce1d9d5e8243ee26

Modified files:
        libpurple/media.c

ChangeLog: 

Make media.c compilable on Windows following guidance from Maiku

-------------- next part --------------
============================================================
--- libpurple/media.c	691896c928253bf850113a04eb385efccd111277
+++ libpurple/media.c	11ebaaa3295e0608b74d89b3dffe3e11810c67c5
@@ -156,7 +156,7 @@ enum {
 
 
 enum {
-	ERROR,
+	S_ERROR,
 	ACCEPTED,
 	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
@@ -328,7 +328,7 @@ purple_media_class_init (PurpleMediaClas
 			"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 @@ purple_media_error(PurpleMedia *media, c
 	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


More information about the Commits mailing list