core: remove internal API refs. to user settings
Remove all references to connection scope and user-settings services from the various internal APIs of the daemon. The external DBus API remains unchanged, albeit in stub form for scope stuff.
This commit is contained in:
@@ -406,16 +406,12 @@ nm_utils_call_dispatcher (const char *action,
|
||||
|
||||
connection_props = value_hash_create ();
|
||||
|
||||
/* Service name */
|
||||
if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_USER) {
|
||||
value_hash_add_str (connection_props,
|
||||
NMD_CONNECTION_PROPS_SERVICE_NAME,
|
||||
NM_DBUS_SERVICE_USER_SETTINGS);
|
||||
} else if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) {
|
||||
value_hash_add_str (connection_props,
|
||||
NMD_CONNECTION_PROPS_SERVICE_NAME,
|
||||
NM_DBUS_SERVICE_SYSTEM_SETTINGS);
|
||||
}
|
||||
/* Backwards compatibility for the days of user settings services:
|
||||
* Claim that this connection is from the system settings service.
|
||||
*/
|
||||
value_hash_add_str (connection_props,
|
||||
NMD_CONNECTION_PROPS_SERVICE_NAME,
|
||||
NM_DBUS_SERVICE_SYSTEM_SETTINGS);
|
||||
|
||||
/* path */
|
||||
value_hash_add_object_path (connection_props,
|
||||
|
Reference in New Issue
Block a user