cpw.maiku.media_refactor: e5c8ea10: Change the media backend interface's set...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: e5c8ea10ec8a48fd431e8c6959c8135a1aa3f9fc
Ancestor: e304d357a545ca3ba7cd478718a20339d59aa81d
Author: maiku at pidgin.im
Date: 2009-10-26T23:17:38
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/e5c8ea10ec8a48fd431e8c6959c8135a1aa3f9fc

Modified files:
        libpurple/media/backend-fs2.c
        libpurple/media/backend-iface.c
        libpurple/media/backend-iface.h

ChangeLog: 

Change the media backend interface's set_send_codec to return gboolean to
be consistent with the PurpleMedia API.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	7c7b9a553cbef719dac6eabb0616740b1d1faa5c
+++ libpurple/media/backend-fs2.c	7b82b12d875817ed5b8a904c14484418e25111d4
@@ -79,8 +79,9 @@ static gboolean purple_media_backend_fs2
 		PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
-static void purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self,
-		const gchar *sess_id, PurpleMediaCodec *codec);
+static gboolean purple_media_backend_fs2_set_send_codec(
+		PurpleMediaBackend *self, const gchar *sess_id,
+		PurpleMediaCodec *codec);
 
 struct _PurpleMediaBackendFs2Class
 {
@@ -1457,10 +1458,11 @@ purple_media_backend_fs2_set_remote_code
 	return TRUE;
 }
 
-static void
+static gboolean
 purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self,
 		const gchar *sess_id, PurpleMediaCodec *codec)
 {
+	return TRUE;
 }
 
 FsConference *
============================================================
--- libpurple/media/backend-iface.c	f4986b3f24596a44a14617a411371657c09547ec
+++ libpurple/media/backend-iface.c	66e765c4c6c382cd91e4aed531e1029f5be7646f
@@ -176,11 +176,11 @@ purple_media_backend_set_remote_codecs(P
 			self, sess_id, participant, codecs);
 }
 
-void
+gboolean
 purple_media_backend_set_send_codec(PurpleMediaBackend *self,
 		const gchar *sess_id, PurpleMediaCodec *codec)
 {
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
-	PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_send_codec(self,
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_send_codec(self,
 			sess_id, codec);
 }
============================================================
--- libpurple/media/backend-iface.h	2c848daf4686df1aa5e882115d5116e3ca64e70b
+++ libpurple/media/backend-iface.h	63e8c35784d9b54cec87542787a6e9a78341a5cf
@@ -61,7 +61,7 @@ struct _PurpleMediaBackendIface
 	gboolean (*set_remote_codecs) (PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
-	void (*set_send_codec) (PurpleMediaBackend *self,
+	gboolean (*set_send_codec) (PurpleMediaBackend *self,
 		const gchar *sess_id, PurpleMediaCodec *codec);
 };
 
@@ -82,7 +82,7 @@ gboolean purple_media_backend_set_remote
 gboolean purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
-void purple_media_backend_set_send_codec(PurpleMediaBackend *self,
+gboolean purple_media_backend_set_send_codec(PurpleMediaBackend *self,
 		const gchar *sess_id, PurpleMediaCodec *codec);
 
 G_END_DECLS