diff options
| author | Eion Robb <eion@robbmob.com> | 2015-06-08 00:29:54 +0300 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2015-06-08 00:29:54 +0300 |
| commit | 6dfe530baf9f53cb69c93820437a4850f4c115d4 (patch) | |
| tree | e1a1e16d182380820f4329f68dacc242a99a4065 /skypeweb/skypeweb_connection.c | |
| parent | 2638847239df3d670e6369fad3ffca069bae1c9e (diff) | |
SkypeWeb : Start converting things over to purple3 with #defines to make it compile for purple2
Diffstat (limited to 'skypeweb/skypeweb_connection.c')
| -rw-r--r-- | skypeweb/skypeweb_connection.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/skypeweb/skypeweb_connection.c b/skypeweb/skypeweb_connection.c index ffc463d..05a664c 100644 --- a/skypeweb/skypeweb_connection.c +++ b/skypeweb/skypeweb_connection.c @@ -20,6 +20,8 @@ #if !PURPLE_VERSION_CHECK(3, 0, 0) #define purple_connection_error purple_connection_error_reason + #define purple_proxy_info_get_proxy_type purple_proxy_info_get_type + #define purple_account_is_disconnecting(account) (account->disconnecting) #endif #if !GLIB_CHECK_VERSION (2, 22, 0) @@ -543,9 +545,9 @@ skypeweb_post_or_get(SkypeWebAccount *sa, SkypeWebMethod method, if (sa && sa->account && !(method & SKYPEWEB_METHOD_SSL)) { proxy_info = purple_proxy_get_setup(sa->account); - if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) + if (purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) proxy_info = purple_global_proxy_get_info(); - if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_HTTP) + if (purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_HTTP) { is_proxy = TRUE; } @@ -701,9 +703,9 @@ static void skypeweb_attempt_connection(SkypeWebConnection *skypewebcon) if (sa && sa->account && !(skypewebcon->method & SKYPEWEB_METHOD_SSL)) { proxy_info = purple_proxy_get_setup(sa->account); - if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) + if (purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) proxy_info = purple_global_proxy_get_info(); - if (purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_HTTP) + if (purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_HTTP) { is_proxy = TRUE; } @@ -753,7 +755,7 @@ static void skypeweb_attempt_connection(SkypeWebConnection *skypewebcon) if (host_ip != NULL) { g_free(skypewebcon->hostname); skypewebcon->hostname = g_strdup(host_ip); - } else if (sa->account && !sa->account->disconnecting) { + } else if (sa->account && !purple_account_is_disconnecting(sa->account)) { GSList *host_lookup_list = NULL; PurpleDnsQueryData *query; |