merge: branch 'ih/nmtui_esc'

nmtui: fix deletion confirmation with ESC key press

Closes #1460

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1835

src/libnmt-newt/nmt-newt-utils.c

@@ -282,7 +282,7 @@ nmt_newt_message_dialog(const char *message, ...)
  * Displays the given message in a dialog box with two buttons with
  * the indicated labels, and waits for the user to click one.
  *
- * Returns: which button was clicked: 0 for @button1 or 1 for @button2
+ * Returns: which button was clicked: 1 for @button1, 2 for @button2 or 0 otherwise
  */
 int
 nmt_newt_choice_dialog(const char *button1, const char *button2, const char *message, ...)

src/nmtui/nmtui-edit.c

@@ -511,7 +511,7 @@ nmt_remove_connection(NMRemoteConnection *connection)
                                     _("Delete"),
                                     _("Are you sure you want to delete the connection '%s'?"),
                                     nm_connection_get_id(NM_CONNECTION(connection)));
-    if (choice == 1)
+    if (choice != 2)
         return;
 
     g_object_ref(connection);