Mercurial > pidgin.yaz
comparison libpurple/proxy.c @ 22408:6eb0749ad46c
disapproval of revision 'd5ef30aafa0c0ecff773017ab7ac542f9ba7b4b4'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 05 Mar 2008 18:11:02 +0000 |
| parents | c5a3a92255f5 |
| children | 7ba68075beea |
comparison
equal
deleted
inserted
replaced
| 22407:c5a3a92255f5 | 22408:6eb0749ad46c |
|---|---|
| 230 return purple_global_proxy_get_info(); | 230 return purple_global_proxy_get_info(); |
| 231 } | 231 } |
| 232 | 232 |
| 233 g_free(tmp); | 233 g_free(tmp); |
| 234 info.type = PURPLE_PROXY_HTTP; | 234 info.type = PURPLE_PROXY_HTTP; |
| 235 | |
| 236 /* Free the old fields */ | |
| 237 if (info.host) { | |
| 238 g_free(info.host); | |
| 239 info.host = NULL; | |
| 240 } | |
| 241 if (info.username) { | |
| 242 g_free(info.username); | |
| 243 info.username = NULL; | |
| 244 } | |
| 245 if (info.password) { | |
| 246 g_free(info.password); | |
| 247 info.password = NULL; | |
| 248 } | |
| 235 | 249 |
| 236 /* Get the new ones */ | 250 /* Get the new ones */ |
| 237 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/host", &info.host, | 251 if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/host", &info.host, |
| 238 NULL, NULL, NULL)) | 252 NULL, NULL, NULL)) |
| 239 return purple_global_proxy_get_info(); | 253 return purple_global_proxy_get_info(); |