diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /src/nm-proxy-config.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
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) { |