# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1058677874 0
# Node ID f0b0c5bca588e0c3053272cf2549fa925f58bbf5
# Parent  9ce44a7f9ae7f8f72b5fa1842a3c45dbb954d34a
[gaim-migrate @ 6736]
File transfers should now have the local IP set to either the account's
public IP or the globally set local IP, if either exist.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9ce44a7f9ae7 -r f0b0c5bca588 src/ft.c
--- a/src/ft.c	Sun Jul 20 03:44:39 2003 +0000
+++ b/src/ft.c	Sun Jul 20 05:11:14 2003 +0000
@@ -31,6 +31,7 @@
 GaimXfer *
 gaim_xfer_new(GaimAccount *account, GaimXferType type, const char *who)
 {
+	const char *ip;
 	GaimXfer *xfer;
 	GaimXferUiOps *ui_ops;
 
@@ -45,6 +46,12 @@
 	xfer->who     = g_strdup(who);
 	xfer->ui_ops  = gaim_get_xfer_ui_ops();
 
+	if ((ip = gaim_account_get_public_ip(account)) != NULL)
+		ip = gaim_prefs_get_string("/core/ft/public_ip");
+
+	if (ip != NULL && *ip != '\0')
+		xfer->local_ip = g_strdup(ip);
+
 	ui_ops = gaim_xfer_get_ui_ops(xfer);
 
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)