summaryrefslogtreecommitdiff
path: root/callouts
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-08-13 14:34:29 -0400
committerDan Winship <danw@gnome.org>2014-08-16 10:17:53 -0400
commite1ba13a426bf6fc34043822d772384559b0831cb (patch)
treea70fc1d7815f244e9b17388a17711df155ed9bda /callouts
parent5ed054aca9d30c13a7c47bd51cb475d857443b44 (diff)
libnm-core, libnm, core: make NMConnection an interface
The fact that NMRemoteConnection has to be an NMConnection and therefore can't be an NMObject means that it needs to reimplement bits of NMObject functionality (and likewise NMObject needs some special magic to deal with it). Likewise, we will need a daemon-side equivalent of NMObject as part of the gdbus port, and we would want NMSettingsConnection to be able to inherit from this as well. Solve this problem by making NMConnection into an interface, and having NMRemoteConnection and NMSettingsConnection implement it. (We use some hacks to keep the GHashTable of NMSettings objects inside nm-connection.c rather than having to be implemented by the implementations.) Since NMConnection is no longer an instantiable type, this adds NMSimpleConnection to replace the various non-D-Bus-based uses of NMConnection throughout the code. nm_connection_new() becomes nm_simple_connection_new(), nm_connection_new_from_hash() becomes nm_simple_connection_new_from_hash(), and nm_connection_duplicate() becomes nm_simple_connection_new_clone().
Diffstat (limited to 'callouts')
-rw-r--r--callouts/tests/test-dispatcher-envp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index 97b839b5f3..1d9792fe9e 100644
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -156,7 +156,7 @@ parse_main (GKeyFile *kf,
if (id == NULL)
return FALSE;
- connection = nm_connection_new ();
+ connection = nm_simple_connection_new ();
g_assert (connection);
s_con = (NMSettingConnection *) nm_setting_connection_new ();
g_assert (s_con);