diff options
| author | Michael Biebl <biebl@debian.org> | 2018-04-23 18:00:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-04-23 18:00:21 +0200 |
| commit | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (patch) | |
| tree | 2dd55c4ab0fdcbe9cddb26adb4a554b1a45c73c8 /src/nm-dispatcher.c | |
| parent | 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (diff) | |
New upstream version 1.11.3 upstream/1.11.3
Diffstat (limited to 'src/nm-dispatcher.c')
| -rw-r--r-- | src/nm-dispatcher.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index 237afdef..235134c8 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -284,9 +284,10 @@ fill_device_props (NMDevice *device, g_variant_new_uint32 (nm_device_get_device_type (device))); g_variant_builder_add (dev_builder, "{sv}", NMD_DEVICE_PROPS_STATE, g_variant_new_uint32 (nm_device_get_state (device))); - if (nm_exported_object_is_exported (NM_EXPORTED_OBJECT (device))) + if (nm_dbus_object_is_exported (NM_DBUS_OBJECT (device))) { g_variant_builder_add (dev_builder, "{sv}", NMD_DEVICE_PROPS_PATH, - g_variant_new_object_path (nm_exported_object_get_path (NM_EXPORTED_OBJECT (device)))); + g_variant_new_object_path (nm_dbus_object_get_path (NM_DBUS_OBJECT (device)))); + } proxy_config = nm_device_get_proxy_config (device); if (proxy_config) @@ -345,8 +346,8 @@ static void _ensure_requests (void) { if (G_UNLIKELY (requests == NULL)) { - requests = g_hash_table_new_full (g_direct_hash, - g_direct_equal, + requests = g_hash_table_new_full (nm_direct_hash, + NULL, NULL, (GDestroyNotify) dispatcher_info_free); } @@ -578,7 +579,7 @@ _dispatcher_call (NMDispatcherAction action, const char *connection_path; const char *filename; - connection_path = nm_connection_get_path (NM_CONNECTION (settings_connection)); + connection_path = nm_dbus_object_get_path (NM_DBUS_OBJECT (settings_connection)); if (connection_path) { g_variant_builder_add (&connection_props, "{sv}", NMD_CONNECTION_PROPS_PATH, @@ -630,9 +631,7 @@ _dispatcher_call (NMDispatcherAction action, if (!device_dhcp6_props) device_dhcp6_props = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("{sv}"), NULL, 0)); -#if WITH_CONCHECK connectivity_state_string = nm_connectivity_state_to_string (connectivity_state); -#endif /* Send the action to the dispatcher */ if (blocking) { |