From dd428301eb6f02542015121d7b08d9997f137e50 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 12 Mar 2019 15:13:33 +0100 Subject: New upstream version 1.15.91 --- clients/tui/newt/nmt-newt-button-box.c | 3 +-- clients/tui/newt/nmt-newt-container.c | 3 +-- clients/tui/newt/nmt-newt-entry-numeric.c | 4 ++-- clients/tui/newt/nmt-newt-entry.c | 2 -- clients/tui/newt/nmt-newt-form.c | 1 - clients/tui/newt/nmt-newt-grid.c | 2 -- clients/tui/newt/nmt-newt-label.c | 3 +-- clients/tui/newt/nmt-newt-section.c | 3 +-- clients/tui/newt/nmt-newt-stack.c | 2 -- clients/tui/newt/nmt-newt-textbox.c | 3 +-- clients/tui/newt/nmt-newt-utils.c | 1 - clients/tui/nm-editor-bindings.c | 5 ++--- clients/tui/nmt-address-list.c | 4 ++-- clients/tui/nmt-device-entry.c | 4 ++-- clients/tui/nmt-editor-grid.c | 2 -- clients/tui/nmt-mac-entry.c | 2 -- clients/tui/nmt-utils.c | 2 -- clients/tui/nmt-widget-list.c | 4 ++-- clients/tui/nmtui-connect.c | 8 ++++---- clients/tui/nmtui.c | 4 ++-- 20 files changed, 21 insertions(+), 41 deletions(-) (limited to 'clients/tui') diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c index 5341c76a..02d8f5cb 100644 --- a/clients/tui/newt/nmt-newt-button-box.c +++ b/clients/tui/newt/nmt-newt-button-box.c @@ -31,9 +31,8 @@ #include "nm-default.h" -#include - #include "nmt-newt-button-box.h" + #include "nmt-newt-button.h" G_DEFINE_TYPE (NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER) diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c index 927f187e..40259025 100644 --- a/clients/tui/newt/nmt-newt-container.c +++ b/clients/tui/newt/nmt-newt-container.c @@ -28,9 +28,8 @@ #include "nm-default.h" -#include - #include "nmt-newt-container.h" + #include "nmt-newt-component.h" G_DEFINE_ABSTRACT_TYPE (NmtNewtContainer, nmt_newt_container, NMT_TYPE_NEWT_WIDGET) diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c index a52fe868..92855fcb 100644 --- a/clients/tui/newt/nmt-newt-entry-numeric.c +++ b/clients/tui/newt/nmt-newt-entry-numeric.c @@ -127,8 +127,8 @@ newt_entry_numeric_validate (NmtNewtEntry *entry, if (!*text) return priv->optional ? TRUE : FALSE; - val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, 0); - return val != 0 || errno == 0; + val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, G_MAXINT64); + return val != G_MAXINT64 || errno == 0; } static void diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c index 2715a738..90c2e467 100644 --- a/clients/tui/newt/nmt-newt-entry.c +++ b/clients/tui/newt/nmt-newt-entry.c @@ -28,8 +28,6 @@ #include "nm-default.h" -#include - #include "nmt-newt-entry.h" #include "nmt-newt-form.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index ccf447ea..cd87a216 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -27,7 +27,6 @@ #include "nm-default.h" #include -#include #include #include "nmt-newt-form.h" diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c index 4333e0dc..e6c487f5 100644 --- a/clients/tui/newt/nmt-newt-grid.c +++ b/clients/tui/newt/nmt-newt-grid.c @@ -42,8 +42,6 @@ #include "nm-default.h" -#include - #include "nmt-newt-grid.h" G_DEFINE_TYPE (NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER) diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c index f9aed8a3..63bd28da 100644 --- a/clients/tui/newt/nmt-newt-label.c +++ b/clients/tui/newt/nmt-newt-label.c @@ -27,9 +27,8 @@ #include "nm-default.h" -#include - #include "nmt-newt-label.h" + #include "nmt-newt-utils.h" G_DEFINE_TYPE (NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT) diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c index 34073454..9b7e44e4 100644 --- a/clients/tui/newt/nmt-newt-section.c +++ b/clients/tui/newt/nmt-newt-section.c @@ -37,9 +37,8 @@ #include "nm-default.h" -#include - #include "nmt-newt-section.h" + #include "nmt-newt-grid.h" #include "nmt-newt-label.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c index 3abf00b1..da4beb8b 100644 --- a/clients/tui/newt/nmt-newt-stack.c +++ b/clients/tui/newt/nmt-newt-stack.c @@ -31,8 +31,6 @@ #include "nm-default.h" -#include - #include "nmt-newt-stack.h" G_DEFINE_TYPE (NmtNewtStack, nmt_newt_stack, NMT_TYPE_NEWT_CONTAINER) diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c index 73794f5e..0850e60c 100644 --- a/clients/tui/newt/nmt-newt-textbox.c +++ b/clients/tui/newt/nmt-newt-textbox.c @@ -26,9 +26,8 @@ #include "nm-default.h" -#include - #include "nmt-newt-textbox.h" + #include "nmt-newt-utils.h" G_DEFINE_TYPE (NmtNewtTextbox, nmt_newt_textbox, NMT_TYPE_NEWT_COMPONENT) diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index e8866500..475faf7e 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -23,7 +23,6 @@ #include "nm-default.h" -#include #include #include #include diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 16ea60d3..df6387c3 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -27,12 +27,11 @@ #include "nm-default.h" +#include "nm-editor-bindings.h" + #include #include #include -#include - -#include "nm-editor-bindings.h" static void value_transform_string_int (const GValue *src_value, diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index 53990d6a..ae1a6b2f 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -30,12 +30,12 @@ #include "nm-default.h" +#include "nmt-address-list.h" + #include #include #include -#include -#include "nmt-address-list.h" #include "nmt-ip-entry.h" G_DEFINE_TYPE (NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST) diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index a4d63e4f..43fbbc16 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -36,12 +36,12 @@ #include "nm-default.h" -#include +#include "nmt-device-entry.h" + #include #include #include "nmtui.h" -#include "nmt-device-entry.h" G_DEFINE_TYPE (NmtDeviceEntry, nmt_device_entry, NMT_TYPE_EDITOR_GRID) diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c index bc8a7843..bb3e78b8 100644 --- a/clients/tui/nmt-editor-grid.c +++ b/clients/tui/nmt-editor-grid.c @@ -39,8 +39,6 @@ #include "nm-default.h" -#include - #include "nmt-editor-grid.h" G_DEFINE_TYPE (NmtEditorGrid, nmt_editor_grid, NMT_TYPE_NEWT_CONTAINER) diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 23c2ab1c..70c8c307 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -30,8 +30,6 @@ #include "nmt-mac-entry.h" -#include - #include "nm-common-macros.h" G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c index 7cd71be2..96b97158 100644 --- a/clients/tui/nmt-utils.c +++ b/clients/tui/nmt-utils.c @@ -23,8 +23,6 @@ #include "nm-default.h" -#include - #include "nmt-utils.h" /** diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index 2fd5af02..ad35f3de 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -32,12 +32,12 @@ #include "nm-default.h" +#include "nmt-widget-list.h" + #include #include #include -#include -#include "nmt-widget-list.h" #include "nmt-newt.h" G_DEFINE_TYPE (NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID) diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 6f29e13e..e43c22e4 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -240,7 +240,7 @@ activate_connection (NMConnection *connection, NMObject *specific_object) { NmtNewtForm *form; - gs_unref_object NMSecretAgentOld *agent = NULL; + gs_unref_object NMSecretAgentSimple *agent = NULL; NmtNewtWidget *label; NmtSyncOp op; const char *specific_object_path; @@ -257,7 +257,7 @@ activate_connection (NMConnection *connection, agent = nm_secret_agent_simple_new ("nmtui"); if (agent) { if (connection) { - nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent), + nm_secret_agent_simple_enable (agent, nm_object_get_path (NM_OBJECT (connection))); } g_signal_connect (agent, @@ -303,7 +303,7 @@ activate_connection (NMConnection *connection, if (agent && !connection) { connection = NM_CONNECTION (nm_active_connection_get_connection (ac)); if (connection) { - nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent), + nm_secret_agent_simple_enable (agent, nm_object_get_path (NM_OBJECT (connection))); } } @@ -341,7 +341,7 @@ activate_connection (NMConnection *connection, g_object_unref (form); if (agent) - nm_secret_agent_old_unregister (agent, NULL, NULL); + nm_secret_agent_old_unregister (NM_SECRET_AGENT_OLD (agent), NULL, NULL); } static void diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 97c528e7..aacc07cb 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -26,14 +26,14 @@ #include "nm-default.h" +#include "nmtui.h" + #include #include -#include #include "nmt-newt.h" #include "nm-editor-bindings.h" -#include "nmtui.h" #include "nmtui-edit.h" #include "nmtui-connect.h" #include "nmtui-hostname.h" -- cgit 1.3.0-6-gf8a5