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 /libnm/tests | |
| 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 'libnm/tests')
| -rw-r--r-- | libnm/tests/test-nm-client.c | 2 | ||||
| -rw-r--r-- | libnm/tests/test-remote-settings-client.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index bad9e83997..2c5b91246c 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -1023,7 +1023,7 @@ activate_failed_cb (GObject *object, ac = nm_client_activate_connection_finish (client, result, &error); g_assert (ac == NULL); - g_assert_error (error, NM_OBJECT_ERROR, NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE); + g_assert_error (error, NM_CLIENT_ERROR, NM_CLIENT_ERROR_OBJECT_CREATION_FAILED); g_clear_error (&error); g_main_loop_quit (loop); diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 7c3c1222ad..f521dbc1c0 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -368,7 +368,7 @@ add_remove_cb (GObject *s, GError *error = NULL; connection = nm_client_add_connection_finish (client, result, &error); - g_assert_error (error, NM_CLIENT_ERROR, NM_CLIENT_ERROR_CONNECTION_REMOVED); + g_assert_error (error, NM_CLIENT_ERROR, NM_CLIENT_ERROR_OBJECT_CREATION_FAILED); g_assert (connection == NULL); *done = TRUE; |