cpw.malu.xmpp.jingle_ft: 16debe38: Removed some unused functions and variab...

malu at pidgin.im malu at pidgin.im
Sun Jan 10 15:05:45 EST 2010


-----------------------------------------------------------------
Revision: 16debe386a2f890f1486474da2f465a3a9e914c7
Ancestor: 6380b0e8ef0015bc021e20f7b080561da79fea11
Author: malu at pidgin.im
Date: 2010-01-10T19:41:31
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/16debe386a2f890f1486474da2f465a3a9e914c7

Modified files:
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/s5b.c

ChangeLog: 

Removed some unused functions and variables...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/ibbs.c	29d82ae0757e33471668ed44252fb426e7dd7c12
+++ libpurple/protocols/jabber/jingle/ibbs.c	4a2ac21d73efa3fa8444c1af09357a592b69e2dc
@@ -162,9 +162,6 @@ jingle_ibb_parse_internal(xmlnode *ibb)
 {
 	JingleTransport *transport = parent_class->parse(ibb);
 	JingleIBBPrivate *priv = JINGLE_IBB_GET_PRIVATE(transport);
-	xmlnode *jingle = xmlnode_get_parent(xmlnode_get_parent(ibb));
-	const gchar *who = xmlnode_get_attrib(jingle, "initiator");
-	const gchar *sid = xmlnode_get_attrib(ibb, "sid");
 	const gchar *block_size = xmlnode_get_attrib(ibb, "block-size");
 
 	if (block_size) {
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	43204facb8f527b6fd12d3559afe502708175b3e
+++ libpurple/protocols/jabber/jingle/s5b.c	baa968eeababbb3455df8f9c1bd7d116d1befbd6
@@ -137,23 +137,6 @@ jingle_s5b_candidate_destroy(JingleS5BCa
 	g_free(candidate);
 }
 
-static JingleS5BCandidate *
-jingle_s5b_candidate_copy(const JingleS5BCandidate *candidate)
-{
-	JingleS5BCandidate *new_cand = g_new0(JingleS5BCandidate, 1);
-	
-	if (new_cand) {
-		new_cand->cid = g_strdup(candidate->cid);
-		new_cand->jid = g_strdup(candidate->jid);
-		new_cand->host = g_strdup(candidate->host);
-		new_cand->port = candidate->port;
-		new_cand->priority = candidate->priority;
-		new_cand->type = candidate->type;
-	}
-
-	return new_cand;
-}
-
 static void
 jingle_s5b_candidate_add_xml_internal(xmlnode *node, 
 	const JingleS5BCandidate *cand)
@@ -587,18 +570,6 @@ jingle_s5b_take_command(JingleS5B *s5b)
 	}
 }
 
-static gboolean
-jingle_s5b_is_connected_to_remote(const JingleS5B *s5b)
-{
-	return s5b->priv->is_connected_to_remote;
-}
-
-static gboolean
-jingle_s5b_remote_is_connected(const JingleS5B *s5b)
-{
-	return s5b->priv->is_remote_connected;
-}
-
 void
 jingle_s5b_stop_connection_attempts(JingleS5B *s5b)
 {
@@ -1114,21 +1085,6 @@ jingle_s5b_candidate_is_local(const Jing
 	return cand->type != JINGLE_S5B_CANDIDATE_TYPE_PROXY;
 }
 
-static gboolean
-jingle_s5b_has_local_candidates(JabberStream *js, JingleS5B *s5b)
-{
-	GList *iter = s5b->priv->local_candidates;
-
-	for (; iter; iter = g_list_next(iter)) {
-		JingleS5BCandidate *cand =
-			(JingleS5BCandidate *) iter->data;
-		if (jingle_s5b_candidate_is_local(cand)) {
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
 static JabberIq *
 jingle_s5b_create_candidate_error(JingleSession *session)
 {


More information about the Commits mailing list