[network-manager-openvpn/NM_0_8] core: proxy port should always be sent

[Dan Williams <dcbw src gnome org>]

commit 0fb44e41e1c990a497a10bf6a520606f642bb41e
Author: Dan Williams <dcbw redhat com>
Date:   Thu Aug 19 12:09:46 2010 -0500

    core: proxy port should always be sent

 src/nm-openvpn-service.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 73e5062..64409ba 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -777,16 +777,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 		if (!strcmp (tmp, "http")) {
 			add_openvpn_arg (args, "--http-proxy");
 			add_openvpn_arg (args, tmp2);
-			if (tmp3 && strlen (tmp3))
-				add_openvpn_arg (args, tmp3);
+			add_openvpn_arg (args, tmp3 ? tmp3 : "8080");
 			add_openvpn_arg (args, "'auto'");  /* Automatic proxy auth method detection */
 			if (tmp4)
 				add_openvpn_arg (args, "--http-proxy-retry");
 		} else if (!strcmp (tmp, "socks")) {
 			add_openvpn_arg (args, "--socks-proxy");
 			add_openvpn_arg (args, tmp2);
-			if (tmp3 && strlen (tmp3))
-				add_openvpn_arg (args, tmp3);
+			add_openvpn_arg (args, tmp3 ? tmp3 : "1080");
 			if (tmp4)
 				add_openvpn_arg (args, "--socks-proxy-retry");
 		} else {