diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2015-12-21 22:14:59 -0600 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2015-12-21 22:14:59 -0600 |
| commit | 7daac9b9e8d061df4e49f4e3127b85438b59875f (patch) | |
| tree | ebff74e7ee47514d3c8c70a531622caef5b44e01 /libpurple/proxy.c | |
| parent | 24bc21a4b6b12b8f4b09cd152206b8cc16845ff1 (diff) | |
| parent | 7091ea47bedf76e4959e79ce054f39f6b799db32 (diff) | |
| download | pidgin-7daac9b9e8d061df4e49f4e3127b85438b59875f.tar.gz | |
Merge default back in
Diffstat (limited to 'libpurple/proxy.c')
| -rw-r--r-- | libpurple/proxy.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libpurple/proxy.c b/libpurple/proxy.c index 143f807e51..a6a12a7a90 100644 --- a/libpurple/proxy.c +++ b/libpurple/proxy.c @@ -332,18 +332,12 @@ purple_gnome_proxy_get_info(void) g_free(tmp); /* 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; - } + g_free(info.host); + info.host = NULL; + g_free(info.username); + info.username = NULL; + g_free(info.password); + info.password = NULL; tmp = purple_gnome_proxy_get_parameter(GNOME_PROXY_USE_SAME_PROXY, gnome_version); if (!tmp) |