diff options
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/common.c | 4 | ||||
| -rw-r--r-- | clients/cli/devices.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c index 88e98154..d3f5f865 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -931,6 +931,8 @@ nmc_readline (const char *prompt_fmt, ...) va_list args; char *prompt, *str; + rl_initialize (); + va_start (args, prompt_fmt); prompt = g_strdup_vprintf (prompt_fmt, args); va_end (args); @@ -985,6 +987,8 @@ nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...) prompt = g_strdup_vprintf (prompt_fmt, args); va_end (args); + rl_initialize (); + /* Hide the actual password */ if (!echo_on) { saved_history = history_get_history_state (); 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++; |