/soc/2013/ashmew2/filetransferY: 114591185edb: Fixed some compil...

[Ashish Gupta]

Changeset: 114591185edb4a98679b31f689a91ee0cef49a29
Author:	 Ashish Gupta <ashmew2 at gmail.com>
Date:	 2014-02-03 20:11 +0530
Branch:	 default
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferY/rev/114591185edb

Description:

Fixed some compile errors

diffstat:

 libpurple/protocols/jabber/google/google_session.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (73 lines):

diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c
--- a/libpurple/protocols/jabber/google/google_session.c
+++ b/libpurple/protocols/jabber/google/google_session.c
@@ -680,7 +680,7 @@ google_session_handle_initiate(JabberStr
 	const gchar *xmlns;
 	GoogleAVSessionData *session_data =
 		(GoogleAVSessionData *) session->session_data;
-
+	gboolean video;
 	if (session->state != UNINIT) {
 		purple_debug_error("jabber", "Received initiate for active session.\n");
 		return FALSE;
@@ -806,9 +806,10 @@ google_session_handle_candidates(JabberS
 							PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
 							address,
 							atoi(port));
-				g_object_set(info, "username", xmlnode_get_attrib(cand,
-							"username"),
-					"password", xmlnode_get_attrib(cand, "password"),
+				g_object_set(info, "username",
+					purple_xmlnode_get_attrib(cand,"username"),
+					"password",
+					purple_xmlnode_get_attrib(cand, "password"),
 					"priority", prio, NULL);
 
 
@@ -820,7 +821,7 @@ google_session_handle_candidates(JabberS
 		}
 		result = jabber_iq_new(js, JABBER_IQ_RESULT);
 		jabber_iq_set_id(result, iq_id);
-		xmlnode_set_attrib(result->node, "to", session->remote_jid);
+		purple_xmlnode_set_attrib(result->node, "to", session->remote_jid);
 		jabber_iq_send(result);
 		return;
 	}
@@ -920,7 +921,7 @@ google_session_handle_transport_accept(J
 {
 	JabberIq *result_iq = jabber_iq_new(js,JABBER_IQ_RESULT);
 
-	xmlnode_set_attrib(result_iq->node, "to", session->remote_jid);
+	purple_xmlnode_set_attrib(result_iq->node, "to", session->remote_jid);
 	jabber_iq_set_id(result_iq, iq_id);
 	jabber_iq_send(result_iq);
 	session->state = IN_PROGRESS;
@@ -1012,7 +1013,7 @@ google_session_handle_reject(JabberStrea
 }
 
 static void
-google_session_handle_terminate(JabberStream *js, GoogleSession *session, PurpleXmlNode *sess)
+google_session_handle_terminate(JabberStream *js, GoogleSession *session, PurpleXmlNode *sess,  const char *iq_id)
 {
 	JabberIq *result = jabber_iq_new(js, JABBER_IQ_RESULT);
 	jabber_iq_set_id(result, iq_id);
@@ -1025,7 +1026,7 @@ google_session_handle_terminate(JabberSt
 	if (session->share) {
 		GoogleXferSessionData *share_session =
 			(GoogleXferSessionData *)session->session_data;
-		share_session->xfer->status = PURPLE_XFER_STATUS_CANCEL_REMOTE;
+		purple_xfer_set_status(share_session->xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);
 
 		if (session->relay_processing)
 			return;
@@ -1153,9 +1154,8 @@ jabber_google_session_parse(JabberStream
 	/* If the session doesn't exist, this has to be an initiate message */
 	if (strcmp(purple_xmlnode_get_attrib(session_node, "type"), "initiate"))
 		return;
-	}
 
-	desc_node = xmlnode_get_child(session_node, "description");
+	desc_node = purple_xmlnode_get_child(session_node, "description");
 	if (!desc_node)
 		return;
 	session = g_new0(GoogleSession, 1);