/soc/2013/ashmew2/filetransferY: 14c6606b9126: Ready for Merge. ...

[Ashish Gupta]

Changeset: 14c6606b9126455e96f58cf52c49fce182c2fb9b
Author:	 Ashish Gupta <ashmew2 at gmail.com>
Date:	 2014-02-16 19:09 +0530
Branch:	 default
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferY/rev/14c6606b9126

Description:

Ready for Merge. Resolved Warnings

diffstat:

 libpurple/protocols/jabber/google/google_session.c |   3 -
 libpurple/protocols/jabber/google/google_share.c   |  43 ----------------------
 2 files changed, 0 insertions(+), 46 deletions(-)

diffs (80 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
@@ -677,8 +677,6 @@ static gboolean
 google_session_handle_initiate(JabberStream *js, GoogleSession *session, PurpleXmlNode *sess, const char *iq_id)
 {
 	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");
@@ -1089,7 +1087,6 @@ jabber_google_session_parse(JabberStream
 {
 	GoogleSession *session = NULL;
 	GoogleSessionId id;
-	GoogleAVSessionData *session_data;
 	PurpleXmlNode *desc_node;
 
 	GList *iter = NULL;
diff --git a/libpurple/protocols/jabber/google/google_share.c b/libpurple/protocols/jabber/google/google_share.c
--- a/libpurple/protocols/jabber/google/google_share.c
+++ b/libpurple/protocols/jabber/google/google_share.c
@@ -1063,25 +1063,6 @@ void cb_new_selected_pair(NiceAgent *age
 			rfoundation);
 }
 
-static void
-gtalk_xfer_start(PurpleXfer *xfer)
-{
-	purple_debug_info("google_session", "Inside gtalk_xfer_start()\n");
-
-	if(purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_SEND) {
-		guchar *buffer = g_malloc(purple_xfer_get_bytes_remaining(xfer));
-		int wrote = purple_xfer_write(xfer, buffer,
-					purple_xfer_get_bytes_remaining(xfer));
-
-		if ( wrote > 0 )
-			purple_xfer_set_bytes_sent( xfer, wrote );
-
-		/* free the buffer */
-		g_free( buffer );
-		buffer = NULL;
-	}
-}
-
 static GoogleSession *
 gtalk_xfer_new_session(JabberStream *js, const char *who)
 {
@@ -1166,30 +1147,6 @@ gtalk_xfer_send(PurpleConnection *gc, co
 
 }
 
-static void
-gtalk_xfer_send_info(JabberStream *js, GoogleSession *session, PurpleXmlNode *sess)
-{
-
-	JabberIq *iq;
-	PurpleXmlNode *session_node, *channel_node;
-
-	purple_debug_info("google_session", "Inside google_xfer_send__accept\n");
-	iq = jabber_iq_new(js, JABBER_IQ_SET);
-	purple_xmlnode_set_attrib(iq->node, "to", session->remote_jid);
-
-	session_node = purple_xmlnode_new_child(iq->node, "session");
-	purple_xmlnode_set_attrib(session_node, "type", "info");
-	purple_xmlnode_set_attrib(session_node, "id", purple_xmlnode_get_attrib(sess, "id"));
-	purple_xmlnode_set_attrib(session_node, "initiator", session->id.initiator);
-	purple_xmlnode_set_namespace(session_node, NS_GOOGLE_SESSION);
-
-	channel_node = purple_xmlnode_new_child(session_node, "channel");
-	purple_xmlnode_set_attrib(channel_node, "name", "private-1");
-	purple_xmlnode_set_namespace(channel_node, NS_GOOGLE_SESSION_SHARE);
-
-	jabber_iq_send(iq);
-}
-
 void
 gtalk_xfer_handle_initiate(JabberStream *js, GoogleSession *session,
 				PurpleXmlNode *sess, const char *iq_id)