diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-13 11:57:35 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-22 08:29:07 -0400 |
| commit | a7b1ee77dbc74fa40864e292c75d764b958634b0 (patch) | |
| tree | e3637575fd8552307493ed88168b6be83f9c799f /libnm | |
| parent | 63957e0ed23e949ad24290f8f4c02f6925bb6bef (diff) | |
| download | NetworkManager-a7b1ee77dbc74fa40864e292c75d764b958634b0.tar.gz | |
libnm-core: drop nm_setting_lookup_type_by_quark()
nm_setting_lookup_type_by_quark() was only ever used in places that
were still mistakenly assuming the old style of nm_connection_verify()
errors, where the error message would contain only a property name and
no further explanation. Fix those places to assume that the error will
contain a real error message, and include both the setting name and
the property name.
Given that, there's no longer any need for
nm_setting_lookup_type_by_quark(), so drop it.
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/libnm.ver | 1 | ||||
| -rw-r--r-- | libnm/nm-vpn-plugin.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libnm/libnm.ver b/libnm/libnm.ver index e0c4795f9e..b8c7fdb5b3 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -686,7 +686,6 @@ global: nm_setting_ip6_config_remove_route; nm_setting_ip6_config_remove_route_by_value; nm_setting_lookup_type; - nm_setting_lookup_type_by_quark; nm_setting_olpc_mesh_error_get_type; nm_setting_olpc_mesh_error_quark; nm_setting_olpc_mesh_get_channel; diff --git a/libnm/nm-vpn-plugin.c b/libnm/nm-vpn-plugin.c index 674c7a97f3..d3fe87bf0a 100644 --- a/libnm/nm-vpn-plugin.c +++ b/libnm/nm-vpn-plugin.c @@ -491,9 +491,8 @@ impl_vpn_plugin_need_secrets (NMVpnPlugin *plugin, g_dbus_method_invocation_return_error (context, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, - "The connection was invalid: '%s' / '%s' invalid: %d.", - g_type_name (nm_setting_lookup_type_by_quark (error->domain)), - error->message, error->code); + "The connection was invalid: %s", + error->message); g_error_free (error); return; } |