comparison libpurple/protocols/yahoo/yahoo_aliases.c @ 23916:18a1f0fe5f40

Do a better job of detecting if the yahoo account is connecting through a HTTP Proxy in order to generate acceptable HTTP requests. Hopefully fixes #6527
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 27 Aug 2008 02:52:50 +0000
parents adbcf5b84438
children c0226e400836
comparison
equal deleted inserted replaced
23915:fd646e79cccf 23916:18a1f0fe5f40
153 struct callback_data *cb; 153 struct callback_data *cb;
154 const char *url; 154 const char *url;
155 gchar *request, *webpage, *webaddress; 155 gchar *request, *webpage, *webaddress;
156 PurpleUtilFetchUrlData *url_data; 156 PurpleUtilFetchUrlData *url_data;
157 157
158 gboolean use_whole_url = FALSE;
159
160 /* use whole URL if using HTTP Proxy */ 158 /* use whole URL if using HTTP Proxy */
161 if ((gc->account->proxy_info) 159 gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
162 && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
163 use_whole_url = TRUE;
164 160
165 /* Using callback_data so I have access to gc in the callback function */ 161 /* Using callback_data so I have access to gc in the callback function */
166 cb = g_new0(struct callback_data, 1); 162 cb = g_new0(struct callback_data, 1);
167 cb->gc = gc; 163 cb->gc = gc;
168 164
264 struct yahoo_data *yd; 260 struct yahoo_data *yd;
265 const char *url; 261 const char *url;
266 gchar *content, *request, *webpage, *webaddress; 262 gchar *content, *request, *webpage, *webaddress;
267 struct callback_data *cb; 263 struct callback_data *cb;
268 PurpleUtilFetchUrlData *url_data; 264 PurpleUtilFetchUrlData *url_data;
269 gboolean use_whole_url = FALSE;
270 YahooFriend *f; 265 YahooFriend *f;
271
272 /* use whole URL if using HTTP Proxy */ 266 /* use whole URL if using HTTP Proxy */
273 if ((gc->account->proxy_info) 267 gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
274 && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
275 use_whole_url = TRUE;
276 268
277 g_return_if_fail(who != NULL); 269 g_return_if_fail(who != NULL);
278 g_return_if_fail(gc != NULL); 270 g_return_if_fail(gc != NULL);
279 271
280 if (alias == NULL) 272 if (alias == NULL)