Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jingle/rtp.c	Tue Mar 24 07:11:26 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Sat Mar 28 00:58:02 2009 +0000
@@ -787,7 +787,7 @@
 	}
 }
 
-PurpleMedia *
+gboolean
 jingle_rtp_initiate_media(JabberStream *js, const gchar *who, 
 		      PurpleMediaSessionType type)
 {
@@ -797,7 +797,6 @@
 	JingleTransport *transport;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	PurpleMedia *media;
 	const gchar *transport_type;
 	
 	gchar *jid = NULL, *me = NULL, *sid = NULL;
@@ -806,7 +805,7 @@
 	jb = jabber_buddy_find(js, who, FALSE);
 	if (!jb) {
 		purple_debug_error("jingle-rtp", "Could not find Jabber buddy\n");
-		return NULL;
+		return FALSE;
 	}
 	jbr = jabber_buddy_find_resource(jb, NULL);
 	if (!jbr) {
@@ -820,7 +819,7 @@
 	} else {
 		purple_debug_error("jingle-rtp", "Resource doesn't support "
 				"the same transport types\n");
-		return NULL;
+		return FALSE;
 	}
 
 	if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
@@ -854,14 +853,14 @@
 		jingle_rtp_init_media(content);
 	}
 
-	if ((media = jingle_rtp_get_media(session)) == NULL) {
-		return NULL;
-	}
-
 	g_free(jid);
 	g_free(me);
 
-	return media;
+	if (jingle_rtp_get_media(session) == NULL) {
+		return FALSE;
+	}
+
+	return TRUE;
 }
 
 void