comparison src/protocols/oscar/peer.c @ 14108:7a205b430d19

[gaim-migrate @ 16742] Removing the "error_cb" parameter for gaim_proxy_connect(), changing it back to how it was. As I started making changes to oscar to support canceling connection attempts, I realized that having a separate callback for errors would result in more code duplication than was needed. Originally I thought the separate callback would make things cleaner. Anyway, sorry for the noise. committer: Tailor Script <[e-mail]>

14107:c0ee28af3ca2

			g_free(tmp);
		}

		conn->connect_info = gaim_proxy_connect(account,
				conn->verifiedip, conn->port,
				peer_connection_established_cb, NULL, conn);
		if (conn->connect_info != NULL)
		{
			/* Connecting... */
			conn->connect_timeout_timer = gaim_timeout_add(15000,
					peer_connection_tooktoolong, conn);

				g_free(tmp);
			}

			conn->connect_info = gaim_proxy_connect(account,
					conn->clientip, conn->port,
					peer_connection_established_cb, NULL, conn);
			if (conn->connect_info != NULL)
			{
				/* Connecting... */
				conn->connect_timeout_timer = gaim_timeout_add(15000,
						peer_connection_tooktoolong, conn);

		}

		conn->connect_info = gaim_proxy_connect(account,
				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
				PEER_PROXY_PORT,
				peer_proxy_connection_established_cb, NULL, conn);
		if (conn->connect_info != NULL)
		{
			/* Connecting... */
			return;
		}

14108:7a205b430d19

			g_free(tmp);
		}

		conn->connect_info = gaim_proxy_connect(account,
				conn->verifiedip, conn->port,
				peer_connection_established_cb, conn);
		if (conn->connect_info != NULL)
		{
			/* Connecting... */
			conn->connect_timeout_timer = gaim_timeout_add(15000,
					peer_connection_tooktoolong, conn);

				g_free(tmp);
			}

			conn->connect_info = gaim_proxy_connect(account,
					conn->clientip, conn->port,
					peer_connection_established_cb, conn);
			if (conn->connect_info != NULL)
			{
				/* Connecting... */
				conn->connect_timeout_timer = gaim_timeout_add(15000,
						peer_connection_tooktoolong, conn);

		}

		conn->connect_info = gaim_proxy_connect(account,
				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
				PEER_PROXY_PORT,
				peer_proxy_connection_established_cb, conn);
		if (conn->connect_info != NULL)
		{
			/* Connecting... */
			return;
		}