cpw.malu.xmpp.jingle_ft: 2764e070: And this time it should actually work wh...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2764e070221409c46deabb980b52689fca1b2771
Ancestor: b8f11d5868aace81a93f0e83596d988725042fdd
Author: malu at pidgin.im
Date: 2009-04-27T21:18:20
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/2764e070221409c46deabb980b52689fca1b2771

Modified files:
        libpurple/protocols/jabber/si.c

ChangeLog: 

And this time it should actually work when the other side supports the old SI
stuff... :)

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/si.c	23fb920eba2a6db495fb41ee59ac577cb187472b
+++ libpurple/protocols/jabber/si.c	963e3463de77e0c10e1319dd8f497b5a12d55913
@@ -1393,17 +1393,11 @@ static void jabber_si_xfer_send_disco_cb
 	}
 }
 
-static void do_transfer_send(PurpleXfer *xfer, const char *resource)
+static void do_transfer_send(PurpleXfer *xfer)
 {
 	JabberSIXfer *jsx = xfer->data;
-	char **who_v = g_strsplit(xfer->who, "/", 2);
-	char *who;
 
-	who = g_strdup_printf("%s/%s", who_v[0], resource);
-	g_strfreev(who_v);
-	g_free(xfer->who);
-	xfer->who = who;
-	jabber_disco_info_do(jsx->js, who,
+	jabber_disco_info_do(jsx->js, xfer->who,
 			jabber_si_xfer_send_disco_cb, xfer);
 }
 
@@ -1412,7 +1406,7 @@ static void jabber_si_xfer_init(PurpleXf
 	JabberSIXfer *jsx = xfer->data;
 	JabberIq *iq;
 	if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) {
-		do_transfer_send(xfer, xfer->who);
+		do_transfer_send(xfer);
 	} else {
 		xmlnode *si, *feature, *x, *field, *value;