Mercurial > pidgin

comparison libpurple/proxy.c @ 25902:be3ba7e07de5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '123d615deaa8daeeea7d7c341a87eab4e83a7958' and 'e3b2ac4f2d9e6a6bc13c0394f980b28a75765258'
author Kevin Stange <kevin@simguy.net>
date Tue, 06 Jan 2009 07:53:19 +0000
parents 4670851af098 a6e3cb32cdd2
children 584063555949
comparison
equal deleted inserted replaced
25901:4670851af098 25902:be3ba7e07de5
236 &tmp, &err, NULL, NULL)) 236 &tmp, &err, NULL, NULL))
237 return purple_global_proxy_get_info(); 237 return purple_global_proxy_get_info();
238 g_free(err); 238 g_free(err);
239 err = NULL; 239 err = NULL;
240 240
241 if (!strcmp(tmp, "none\n")) { 241 if (purple_strequal(tmp, "none\n")) {
242 info.type = PURPLE_PROXY_NONE; 242 info.type = PURPLE_PROXY_NONE;
243 g_free(tmp); 243 g_free(tmp);
244 return &info; 244 return &info;
245 } 245 }
246 246
247 if (strcmp(tmp, "manual\n")) { 247 if (purple_strequal(tmp, "manual\n")) {
248 /* Unknown setting. Fallback to using our global proxy settings. */ 248 /* Unknown setting. Fallback to using our global proxy settings. */
249 g_free(tmp); 249 g_free(tmp);
250 return purple_global_proxy_get_info(); 250 return purple_global_proxy_get_info();
251 } 251 }
252 252
271 &tmp, &err, NULL, NULL)) 271 &tmp, &err, NULL, NULL))
272 return purple_global_proxy_get_info(); 272 return purple_global_proxy_get_info();
273 g_free(err); 273 g_free(err);
274 err = NULL; 274 err = NULL;
275 275
276 if (!strcmp(tmp, "true\n")) 276 if (purple_strequal(tmp, "true\n"))
277 use_same_proxy = TRUE; 277 use_same_proxy = TRUE;
278 g_free(tmp); 278 g_free(tmp);
279 tmp = NULL; 279 tmp = NULL;
280 280
281 if (!use_same_proxy) { 281 if (!use_same_proxy) {
2250 proxy_pref_cb(const char *name, PurplePrefType type, 2250 proxy_pref_cb(const char *name, PurplePrefType type,
2251 gconstpointer value, gpointer data) 2251 gconstpointer value, gpointer data)
2252 { 2252 {
2253 PurpleProxyInfo *info = purple_global_proxy_get_info(); 2253 PurpleProxyInfo *info = purple_global_proxy_get_info();
2254 2254
2255 if (!strcmp(name, "/purple/proxy/type")) { 2255 if (purple_strequal(name, "/purple/proxy/type")) {
2256 int proxytype; 2256 int proxytype;
2257 const char *type = value; 2257 const char *type = value;
2258 2258
2259 if (!strcmp(type, "none")) 2259 if (purple_strequal(type, "none"))
2260 proxytype = PURPLE_PROXY_NONE; 2260 proxytype = PURPLE_PROXY_NONE;
2261 else if (!strcmp(type, "http")) 2261 else if (purple_strequal(type, "http"))
2262 proxytype = PURPLE_PROXY_HTTP; 2262 proxytype = PURPLE_PROXY_HTTP;
2263 else if (!strcmp(type, "socks4")) 2263 else if (purple_strequal(type, "socks4"))
2264 proxytype = PURPLE_PROXY_SOCKS4; 2264 proxytype = PURPLE_PROXY_SOCKS4;
2265 else if (!strcmp(type, "socks5")) 2265 else if (purple_strequal(type, "socks5"))
2266 proxytype = PURPLE_PROXY_SOCKS5; 2266 proxytype = PURPLE_PROXY_SOCKS5;
2267 else if (!strcmp(type, "envvar")) 2267 else if (purple_strequal(type, "envvar"))
2268 proxytype = PURPLE_PROXY_USE_ENVVAR; 2268 proxytype = PURPLE_PROXY_USE_ENVVAR;
2269 else 2269 else
2270 proxytype = -1; 2270 proxytype = -1;
2271 2271
2272 purple_proxy_info_set_type(info, proxytype); 2272 purple_proxy_info_set_type(info, proxytype);
2273 } else if (!strcmp(name, "/purple/proxy/host")) 2273 } else if (purple_strequal(name, "/purple/proxy/host"))
2274 purple_proxy_info_set_host(info, value); 2274 purple_proxy_info_set_host(info, value);
2275 else if (!strcmp(name, "/purple/proxy/port")) 2275 else if (purple_strequal(name, "/purple/proxy/port"))
2276 purple_proxy_info_set_port(info, GPOINTER_TO_INT(value)); 2276 purple_proxy_info_set_port(info, GPOINTER_TO_INT(value));
2277 else if (!strcmp(name, "/purple/proxy/username")) 2277 else if (purple_strequal(name, "/purple/proxy/username"))
2278 purple_proxy_info_set_username(info, value); 2278 purple_proxy_info_set_username(info, value);
2279 else if (!strcmp(name, "/purple/proxy/password")) 2279 else if (purple_strequal(name, "/purple/proxy/password"))
2280 purple_proxy_info_set_password(info, value); 2280 purple_proxy_info_set_password(info, value);
2281 } 2281 }
2282 2282
2283 void * 2283 void *
2284 purple_proxy_get_handle() 2284 purple_proxy_get_handle()