# HG changeset patch # User Mark Doliner # Date 1204741045 0 # Node ID 04b807c8b98d59001c86b418d0e6d6e2916408ec # Parent 7ba68075beea72e1cce706efe090005fd9f31b51 Bring back the lines that free info.whatever on subsequent calls to purple_gnome_proxy_get_info(). Stu pointed out that they ARE needed because 'info' is a static variable. I should have merged these back into the function when I disapproved of d5ef30aafa0c0ecff773017ab7ac542f9ba7b4b4, but holy cow that was a crazy 3-way merge. diff -r 7ba68075beea -r 04b807c8b98d libpurple/proxy.c --- a/libpurple/proxy.c Wed Mar 05 18:13:11 2008 +0000 +++ b/libpurple/proxy.c Wed Mar 05 18:17:25 2008 +0000 @@ -241,6 +241,20 @@ /* If we get this far then we know we're using an HTTP proxy */ info.type = PURPLE_PROXY_HTTP; + /* Free the old fields */ + if (info.host) { + g_free(info.host); + info.host = NULL; + } + if (info.username) { + g_free(info.username); + info.username = NULL; + } + if (info.password) { + g_free(info.password); + info.password = NULL; + } + if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/host", &info.host, NULL, NULL, NULL)) return purple_global_proxy_get_info();