pidgin.vv: cad63306: Use the right enum for the stream-info s...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Sat Mar 21 05:15:56 EDT 2009


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

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

ChangeLog: 

Use the right enum for the stream-info signal.

-------------- next part --------------
============================================================
--- libpurple/media.c	313edc232a2ea237deab6b26af2bb141e0ae0f2e
+++ libpurple/media.c	e37920ee3d4d08806b30b792311e12d7793e8736
@@ -181,6 +181,27 @@ purple_media_state_changed_get_type()
 	return type;
 }
 
+GType
+purple_media_info_type_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_INFO_HANGUP,
+					"PURPLE_MEDIA_INFO_HANGUP", "hangup" },
+			{ PURPLE_MEDIA_INFO_REJECT,
+					"PURPLE_MEDIA_INFO_REJECT", "reject" },
+			{ PURPLE_MEDIA_INFO_MUTE,
+					"PURPLE_MEDIA_INFO_MUTE", "mute" },
+			{ PURPLE_MEDIA_INFO_HOLD,
+					"PURPLE_MEDIA_INFO_HOLD", "hold" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaInfoType", values);
+	}
+	return type;
+}
+
 static void
 purple_media_class_init (PurpleMediaClass *klass)
 {
@@ -255,7 +276,7 @@ purple_media_class_init (PurpleMediaClas
 	purple_media_signals[STREAM_INFO] = g_signal_new("stream-info", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__ENUM_STRING_STRING,
-					 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_STATE_CHANGED,
+					 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_INFO_TYPE,
 					 G_TYPE_STRING, G_TYPE_STRING);
 	g_type_class_add_private(klass, sizeof(PurpleMediaPrivate));
 }
============================================================
--- libpurple/media.h	00550594c4bb584af2de4f7d8f23b825ff7c0e9b
+++ libpurple/media.h	7577094fe1072f3e686a952cb7d165b6aa2c9cbc
@@ -45,6 +45,7 @@ G_BEGIN_DECLS
 #define PURPLE_MEDIA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA, PurpleMediaClass))
 
 #define PURPLE_MEDIA_TYPE_STATE_CHANGED	(purple_media_state_changed_get_type())
+#define PURPLE_MEDIA_TYPE_INFO_TYPE	(purple_media_info_type_get_type())
 
 /** @copydoc _PurpleMedia */
 typedef struct _PurpleMedia PurpleMedia;


More information about the Commits mailing list