diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-24 21:01:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-24 21:01:12 +0200 |
| commit | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (patch) | |
| tree | e3eb1ffa953bc2ca100c9c50ab2aaa8cbfffa8f0 /clients/cli/devices.c | |
| parent | 6518e361171f64bcaaa4bf868139362ed95cc2e0 (diff) | |
New upstream version 1.14.4 upstream/1.14.4
Diffstat (limited to 'clients/cli/devices.c')
| -rw-r--r-- | clients/cli/devices.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index ca575c33..029ca671 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -2436,8 +2436,9 @@ delete_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; device_cb_info_finish (info, device); } else { - if (nmc->nowait_flag) - device_cb_info_finish (info, device); + g_print (_("Device '%s' successfully removed.\n"), + nm_device_get_iface (device)); + device_cb_info_finish (info, device); } } @@ -2465,9 +2466,6 @@ do_devices_delete (NmCli *nmc, int argc, char **argv) if (nmc->timeout > 0) info->timeout_id = g_timeout_add_seconds (nmc->timeout, device_op_timeout_cb, info); - g_signal_connect (nmc->client, NM_CLIENT_DEVICE_REMOVED, - G_CALLBACK (device_removed_cb), info); - nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait++; |