Mercurial > pidgin

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 29bc149cbd07
children 4e1286e76f1f
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c	Tue Mar 24 07:11:26 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sat Mar 28 00:58:02 2009 +0000
@@ -281,7 +281,7 @@
 }
 
 
-PurpleMedia*
+gboolean
 jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
 {
 	GoogleSession *session;
@@ -296,7 +296,7 @@
 	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) {
@@ -333,7 +333,7 @@
 		purple_media_hangup(session->media);
 		google_session_destroy(session);
 		g_free(params);
-		return NULL;
+		return FALSE;
 	}
 
 	g_signal_connect_swapped(G_OBJECT(session->media),
@@ -348,7 +348,7 @@
 
 	g_free(params);
 
-	return session->media;
+	return (session->media != NULL) ? TRUE : FALSE;
 }
 
 static void