summaryrefslogtreecommitdiff
path: root/src/nm-manager.h
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-07-14 16:53:24 +0200
committerThomas Haller <thaller@redhat.com>2015-09-18 17:32:11 +0200
commit06da3532428e3498c1e808ff8be1af48b540a6ff (patch)
tree80155896a11d61517bc7cb87df16b3f0ede16f25 /src/nm-manager.h
parentc9b3617c35b3380428a1800e8aa6692ee68b4b74 (diff)
downloadNetworkManager-06da3532428e3498c1e808ff8be1af48b540a6ff.tar.gz
core: separate active and applied connection
Clone the connection upon activation. This makes it safe for the user to modify the original connection while it is activated. This involves several changes: - NMActiveConnection gets @settings_connection and @applied_connection. To support add-and-activate, we constructing a NMActiveConnection with no connection set. Previously, we would set the "connection" field to a temporary NMConnection. Now NMManager piggybacks this temporary connection as object-data (TAG_ACTIVE_CONNETION_ADD_AND_ACTIVATE). - get rid of the functions nm_active_connection_get_connection_type() and nm_active_connection_get_connection_uuid(). From their names it is unclear whether this returns the settings or applied connection. The (few) callers should figure that out themselves. - rename nm_active_connection_get_id() to nm_active_connection_get_settings_connection_id(). This function is only used internally for logging. - dispatcher calls now get two connections as well. The applied-connection is used for the connection data, while the settings-connection is used for the connection path. - needs special handling for properties that apply immediately when changed (nm_device_reapply_settings_immediately()). Co-Authored-By: Thomas Haller <thaller@redhat.com> https://bugzilla.gnome.org/show_bug.cgi?id=724041
Diffstat (limited to 'src/nm-manager.h')
-rw-r--r--src/nm-manager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 632cd0d0b4..39123f8b41 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -23,7 +23,7 @@
#define __NETWORKMANAGER_MANAGER_H__
#include "nm-exported-object.h"
-#include "nm-connection.h"
+#include "nm-settings-connection.h"
#define NM_TYPE_MANAGER (nm_manager_get_type ())
#define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))
@@ -98,7 +98,7 @@ NMDevice * nm_manager_get_device_by_ifindex (NMManager *manager,
int ifindex);
NMActiveConnection *nm_manager_activate_connection (NMManager *manager,
- NMConnection *connection,
+ NMSettingsConnection *connection,
const char *specific_object,
NMDevice *device,
NMAuthSubject *subject,