diff libpurple/protocols/jabber/jabber.c @ 26365:34eb898478b4

Don't assume a PurpleMedia instance will be created immediately.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 28 Mar 2009 00:58:02 +0000
parents d06236d07c9e
children da651b0f40a1
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Tue Mar 24 07:11:26 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Mar 28 00:58:02 2009 +0000
@@ -2612,7 +2612,7 @@
 	return TRUE;
 }
 
-PurpleMedia *
+gboolean
 jabber_initiate_media(PurpleConnection *gc, const char *who, 
 		      PurpleMediaSessionType type)
 {
@@ -2623,14 +2623,14 @@
 	if (!js) {
 		purple_debug_error("jabber",
 				"jabber_initiate_media: NULL stream\n");
-		return NULL;
+		return FALSE;
 	}
 
 	jb = jabber_buddy_find(js, who, FALSE);
 
 	if (!jb) {
 		purple_debug_error("jabber", "Could not find buddy\n");
-		return NULL;
+		return FALSE;
 	}
 
 	if (type & PURPLE_MEDIA_AUDIO &&
@@ -2641,7 +2641,7 @@
 	else
 		return jingle_rtp_initiate_media(gc->proto_data, who, type);
 #else
-	return NULL;
+	return FALSE;
 #endif
 }