diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-20 14:03:30 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-22 08:29:10 -0400 |
| commit | 388a0c5e784b4babd80b57f8a66250bd3db37262 (patch) | |
| tree | 66cdb311d3429f7fda237560de19fca6dc458146 /clients | |
| parent | 2ff4a7d4b0a7892fb08291d34e28df1cce31dbb9 (diff) | |
| download | NetworkManager-388a0c5e784b4babd80b57f8a66250bd3db37262.tar.gz | |
libnm: consolidate NMClientError and NMObjectError
Consolidate NMClientError and NMObjectError (such that there is now
only one libnm-API-specific error domain). In particular, merge
NM_CONNECTION_ERROR_CONNECTION_REMOVED with
NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE as the new
NM_CONNECTION_ERROR_OBJECT_CREATION_FAILED.
Also make object_creation_failed() be a plain method rather than a
signal, since there's no reason for anyone to be connecting to it on
another object. And remove its GError argument because the subclass
can just create its own more-specific error.
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/tui/nmtui-connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 7e04657aff..be03796986 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -86,7 +86,7 @@ activate_ac_state_changed (GObject *object, return; if (state != NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { - error = g_error_new_literal (NM_CLIENT_ERROR, NM_CLIENT_ERROR_UNKNOWN, + error = g_error_new_literal (NM_CLIENT_ERROR, NM_CLIENT_ERROR_FAILED, _("Activation failed")); } |