Mercurial > pidgin.yaz
comparison libpurple/proxy.c @ 23024:8a1798bcddc6
applied changes from ffe11b98734ebc297dc36ad3e623bc945fdb5cc4
through 0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 19 Jun 2008 03:09:38 +0000 |
| parents | 1c7896012802 |
| children | 5c70d953a497 |
comparison
equal
deleted
inserted
replaced
| 23023:ed346fedec30 | 23024:8a1798bcddc6 |
|---|---|
| 263 { | 263 { |
| 264 purple_debug_info("proxy", "Gnome proxy settings are set to " | 264 purple_debug_info("proxy", "Gnome proxy settings are set to " |
| 265 "'manual' but no proxy server is specified. Using " | 265 "'manual' but no proxy server is specified. Using " |
| 266 "Pidgin's proxy settings instead.\n"); | 266 "Pidgin's proxy settings instead.\n"); |
| 267 g_free(info.host); | 267 g_free(info.host); |
| 268 info.host = NULL; | |
| 268 return purple_global_proxy_get_info(); | 269 return purple_global_proxy_get_info(); |
| 269 } | 270 } |
| 270 | 271 |
| 271 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_user", | 272 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_user", |
| 272 &info.username, NULL, NULL, NULL)) | 273 &info.username, NULL, NULL, NULL)) |
| 273 { | 274 { |
| 274 g_free(info.host); | 275 g_free(info.host); |
| 276 info.host = NULL; | |
| 275 return purple_global_proxy_get_info(); | 277 return purple_global_proxy_get_info(); |
| 276 } | 278 } |
| 277 g_strchomp(info.username); | 279 g_strchomp(info.username); |
| 278 | 280 |
| 279 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_password", | 281 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_password", |
| 280 &info.password, NULL, NULL, NULL)) | 282 &info.password, NULL, NULL, NULL)) |
| 281 { | 283 { |
| 282 g_free(info.host); | 284 g_free(info.host); |
| 285 info.host = NULL; | |
| 283 g_free(info.username); | 286 g_free(info.username); |
| 287 info.username = NULL; | |
| 284 return purple_global_proxy_get_info(); | 288 return purple_global_proxy_get_info(); |
| 285 } | 289 } |
| 286 g_strchomp(info.password); | 290 g_strchomp(info.password); |
| 287 | 291 |
| 288 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/port", | 292 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/port", |
| 289 &tmp, NULL, NULL, NULL)) | 293 &tmp, NULL, NULL, NULL)) |
| 290 { | 294 { |
| 291 g_free(info.host); | 295 g_free(info.host); |
| 296 info.host = NULL; | |
| 292 g_free(info.username); | 297 g_free(info.username); |
| 298 info.username = NULL; | |
| 293 g_free(info.password); | 299 g_free(info.password); |
| 300 info.password = NULL; | |
| 294 return purple_global_proxy_get_info(); | 301 return purple_global_proxy_get_info(); |
| 295 } | 302 } |
| 296 info.port = atoi(tmp); | 303 info.port = atoi(tmp); |
| 297 g_free(tmp); | 304 g_free(tmp); |
| 298 | 305 |