comparison: libpurple/proxy.c
libpurple/proxy.c
- changeset 37942
- 33f8691a69df
- parent 37939
- 8df8870e946c
- child 37964
- 39fca28f1a6e
equal
deleted
inserted
replaced
| 37941:5c9865516e99 | 37942:33f8691a69df |
|---|---|
| 1036 gchar *auth; | 1036 gchar *auth; |
| 1037 gchar *proxy; | 1037 gchar *proxy; |
| 1038 GProxyResolver *resolver; | 1038 GProxyResolver *resolver; |
| 1039 | 1039 |
| 1040 if (purple_proxy_info_get_proxy_type(info) == PURPLE_PROXY_NONE) { | 1040 if (purple_proxy_info_get_proxy_type(info) == PURPLE_PROXY_NONE) { |
| 1041 /* Return the default proxy which, if it doesn't support any | 1041 /* Return an empty simple resolver, which will resolve on direct |
| 1042 * further system proxy settings than purple_proxy_get_setup() | 1042 * connection. */ |
| 1043 * detects, will end up as direct connections as intended. | 1043 return g_simple_proxy_resolver_new(NULL, NULL); |
| 1044 */ | |
| 1045 return g_object_ref(g_proxy_resolver_get_default()); | |
| 1046 } | 1044 } |
| 1047 | 1045 |
| 1048 switch (purple_proxy_info_get_proxy_type(info)) | 1046 switch (purple_proxy_info_get_proxy_type(info)) |
| 1049 { | 1047 { |
| 1050 /* PURPLE_PROXY_NONE already handled above */ | 1048 /* PURPLE_PROXY_NONE already handled above */ |
