diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /src/nm-proxy-config.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'src/nm-proxy-config.c')
| -rw-r--r-- | src/nm-proxy-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-proxy-config.c b/src/nm-proxy-config.c index feee4afe..06bb89ba 100644 --- a/src/nm-proxy-config.c +++ b/src/nm-proxy-config.c @@ -65,7 +65,7 @@ nm_proxy_config_merge_setting (NMProxyConfig *config, NMSettingProxy *setting) priv = NM_PROXY_CONFIG_GET_PRIVATE (config); - g_clear_pointer (&priv->pac_script, g_free); + nm_clear_g_free (&priv->pac_script); method = nm_setting_proxy_get_method (setting); switch (method) { |