diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp index c5c85adb6d8b8da377921bd754d44b678631e3c0..62459980d1bf5a51dd61a2d80f7ed8f05daf1b2b 100644 --- a/backends/libpurple/main.cpp +++ b/backends/libpurple/main.cpp @@ -299,15 +299,15 @@ class SpectrumNetworkPlugin : public NetworkPlugin { } if (!CONFIG_STRING_DEFAULTED(config, "proxy.type", "").empty()) { - PurpleProxyInfo *info = purple_proxy_info_new(); + PurpleProxyInfo *info = purple_proxy_info_new_wrapped(); if (CONFIG_STRING_DEFAULTED(config, "proxy.type", "") == "http") { - purple_proxy_info_set_type(info, PURPLE_PROXY_HTTP); + purple_proxy_info_set_type_wrapped(info, PURPLE_PROXY_HTTP); } else if (CONFIG_STRING_DEFAULTED(config, "proxy.type", "") == "socks4") { - purple_proxy_info_set_type(info, PURPLE_PROXY_SOCKS4); + purple_proxy_info_set_type_wrapped(info, PURPLE_PROXY_SOCKS4); } else if (CONFIG_STRING_DEFAULTED(config, "proxy.type", "") == "socks5") { - purple_proxy_info_set_type(info, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_type_wrapped(info, PURPLE_PROXY_SOCKS5); } else { LOG4CXX_ERROR(logger, "Unknown proxy.type " << CONFIG_STRING_DEFAULTED(config, "proxy.type", "")); @@ -316,20 +316,20 @@ class SpectrumNetworkPlugin : public NetworkPlugin { info->username = NULL; info->password = NULL; - purple_proxy_info_set_type(info, PURPLE_PROXY_SOCKS5); - purple_proxy_info_set_host(info, CONFIG_STRING_DEFAULTED(config, "proxy.host", "").c_str()); + purple_proxy_info_set_type_wrapped(info, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_host_wrapped(info, CONFIG_STRING_DEFAULTED(config, "proxy.host", "").c_str()); if (CONFIG_INT_DEFAULTED(config, "proxy.port", 0)) { - purple_proxy_info_set_port(info, CONFIG_INT_DEFAULTED(config, "proxy.port", 0)); + purple_proxy_info_set_port_wrapped(info, CONFIG_INT_DEFAULTED(config, "proxy.port", 0)); } if (!CONFIG_STRING_DEFAULTED(config, "proxy.username", "").empty()) { - purple_proxy_info_set_username(info, CONFIG_STRING_DEFAULTED(config, "proxy.username", "").c_str()); + purple_proxy_info_set_username_wrapped(info, CONFIG_STRING_DEFAULTED(config, "proxy.username", "").c_str()); } if (!CONFIG_STRING_DEFAULTED(config, "proxy.password", "").empty()) { - purple_proxy_info_set_password(info, CONFIG_STRING_DEFAULTED(config, "proxy.password", "").c_str()); + purple_proxy_info_set_password_wrapped(info, CONFIG_STRING_DEFAULTED(config, "proxy.password", "").c_str()); } - purple_account_set_proxy_info(account, info); + purple_account_set_proxy_info_wrapped(account, info); } } @@ -1657,7 +1657,7 @@ static bool initPurple() { std::string libPurpleDllPath = CONFIG_STRING_DEFAULTED(config, "purple.libpurple_dll_path", ""); - if (!resolvePurpleFunctions(libPurpleDllPath)) { + if (!resolvePurpleFunctions()) { LOG4CXX_ERROR(logger, "Unable to load libpurple.dll or some of the needed methods"); return false; }