From 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 8 Sep 2018 17:44:06 +0200 Subject: New upstream version 1.13.90 --- clients/tui/meson.build | 1 - clients/tui/nm-editor-bindings.c | 22 +++++++++++----------- clients/tui/nm-editor-bindings.h | 20 ++++++++++---------- clients/tui/nm-editor-utils.c | 4 ++-- clients/tui/nmt-page-ip-tunnel.c | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) (limited to 'clients/tui') diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 40eb4b4a..5f7f0fbb 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -7,7 +7,6 @@ deps = [ cflags = clients_cflags + [ '-DG_LOG_DOMAIN="@0@"'.format(name), - '-DNMLOCALEDIR="@0@"'.format(nm_localedir) ] subdir('newt') diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 24803868..8df741f5 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -59,7 +59,7 @@ value_transform_string_uint (const GValue *src_value, if (val < 0 || val > G_MAXUINT || *end) return; - g_value_set_uint (dest_value, (gint) val); + g_value_set_uint (dest_value, (int) val); } void @@ -180,9 +180,9 @@ ip_addresses_with_prefix_from_strv (GBinding *binding, void nm_editor_bind_ip_addresses_with_prefix_to_strv (int addr_family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer target, - const gchar *target_property, + const char *target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, @@ -232,9 +232,9 @@ ip_addresses_check_and_copy (GBinding *binding, void nm_editor_bind_ip_addresses_to_strv (int addr_family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer target, - const gchar *target_property, + const char *target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, @@ -328,8 +328,8 @@ void nm_editor_bind_ip_gateway_to_string (int addr_family, NMSettingIPConfig *source, gpointer target, - const gchar *target_property, - const gchar *target_sensitive_property, + const char *target_property, + const char *target_sensitive_property, GBindingFlags flags) { g_object_bind_property_full (source, "gateway", @@ -535,13 +535,13 @@ ip_route_transform_from_metric_string (GBinding *binding, void nm_editor_bind_ip_route_to_strings (int addr_family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer dest_target, - const gchar *dest_target_property, + const char *dest_target_property, gpointer next_hop_target, - const gchar *next_hop_target_property, + const char *next_hop_target_property, gpointer metric_target, - const gchar *metric_target_property, + const char *metric_target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index 72bd91e3..174fb929 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -23,33 +23,33 @@ void nm_editor_bindings_init (void); void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer target, - const gchar *target_property, + const char *target_property, GBindingFlags flags); void nm_editor_bind_ip_addresses_to_strv (int family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer target, - const gchar *target_property, + const char *target_property, GBindingFlags flags); void nm_editor_bind_ip_gateway_to_string (int family, NMSettingIPConfig *source, gpointer target, - const gchar *target_property, - const gchar *target_sensitive_property, + const char *target_property, + const char *target_sensitive_property, GBindingFlags flags); void nm_editor_bind_ip_route_to_strings (int family, gpointer source, - const gchar *source_property, + const char *source_property, gpointer dest_target, - const gchar *dest_target_property, + const char *dest_target_property, gpointer next_hop_target, - const gchar *next_hop_target_property, + const char *next_hop_target_property, gpointer metric_target, - const gchar *metric_target_property, + const char *metric_target_property, GBindingFlags flags); void nm_editor_bind_wireless_security_method (NMConnection *connection, diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 8fecefa8..9dd95c08 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -33,7 +33,7 @@ static GSList *vpn_plugins; -static gint +static int sort_vpn_plugins (gconstpointer a, gconstpointer b) { NMVpnEditorPlugin *aa = NM_VPN_EDITOR_PLUGIN (a); @@ -93,7 +93,7 @@ typedef struct { gboolean no_autoconnect; } NMEditorConnectionTypeDataReal; -static gint +static int sort_types (gconstpointer a, gconstpointer b) { NMEditorConnectionTypeData *typea = *(NMEditorConnectionTypeData **)a; diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c index 0b0b30ea..563abf76 100644 --- a/clients/tui/nmt-page-ip-tunnel.c +++ b/clients/tui/nmt-page-ip-tunnel.c @@ -94,7 +94,7 @@ add_offset (GBinding *binding, gpointer user_data) { guint v; - gint offset = GPOINTER_TO_INT (user_data); + int offset = GPOINTER_TO_INT (user_data); g_return_val_if_fail (G_VALUE_HOLDS (from_value, G_TYPE_UINT), FALSE); g_return_val_if_fail (G_VALUE_HOLDS (to_value, G_TYPE_UINT), FALSE); -- cgit 1.3.0-6-gf8a5 From c240974325c552cad177c457d6ff04e381fd77a3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 15 Sep 2018 01:04:32 +0200 Subject: New upstream version 1.14.0 --- clients/tui/nmtui-connect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'clients/tui') diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 2a954fb8..6f29e13e 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -121,13 +121,13 @@ secrets_requested (NMSecretAgentSimple *agent, continue; if (!nm_streq0 (secret->vpn_type, NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT)) continue; - if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "cookie")) { + if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "cookie")) { g_free (secret->value); secret->value = g_steal_pointer (&cookie); - } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gateway")) { + } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gateway")) { g_free (secret->value); secret->value = g_steal_pointer (&gateway); - } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gwcert")) { + } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "gwcert")) { g_free (secret->value); secret->value = g_steal_pointer (&gwcert); } -- cgit 1.3.0-6-gf8a5 From e126f3e804c35480c4f075777430419d6ece23da Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 23 Sep 2018 10:10:27 +0200 Subject: New upstream version 1.12.4 --- clients/tui/meson.build | 1 + clients/tui/nm-editor-bindings.c | 22 +++++++++++----------- clients/tui/nm-editor-bindings.h | 20 ++++++++++---------- clients/tui/nm-editor-utils.c | 4 ++-- clients/tui/nmt-page-ip-tunnel.c | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) (limited to 'clients/tui') diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 5f7f0fbb..40eb4b4a 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -7,6 +7,7 @@ deps = [ cflags = clients_cflags + [ '-DG_LOG_DOMAIN="@0@"'.format(name), + '-DNMLOCALEDIR="@0@"'.format(nm_localedir) ] subdir('newt') diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c index 8df741f5..24803868 100644 --- a/clients/tui/nm-editor-bindings.c +++ b/clients/tui/nm-editor-bindings.c @@ -59,7 +59,7 @@ value_transform_string_uint (const GValue *src_value, if (val < 0 || val > G_MAXUINT || *end) return; - g_value_set_uint (dest_value, (int) val); + g_value_set_uint (dest_value, (gint) val); } void @@ -180,9 +180,9 @@ ip_addresses_with_prefix_from_strv (GBinding *binding, void nm_editor_bind_ip_addresses_with_prefix_to_strv (int addr_family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer target, - const char *target_property, + const gchar *target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, @@ -232,9 +232,9 @@ ip_addresses_check_and_copy (GBinding *binding, void nm_editor_bind_ip_addresses_to_strv (int addr_family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer target, - const char *target_property, + const gchar *target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, @@ -328,8 +328,8 @@ void nm_editor_bind_ip_gateway_to_string (int addr_family, NMSettingIPConfig *source, gpointer target, - const char *target_property, - const char *target_sensitive_property, + const gchar *target_property, + const gchar *target_sensitive_property, GBindingFlags flags) { g_object_bind_property_full (source, "gateway", @@ -535,13 +535,13 @@ ip_route_transform_from_metric_string (GBinding *binding, void nm_editor_bind_ip_route_to_strings (int addr_family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer dest_target, - const char *dest_target_property, + const gchar *dest_target_property, gpointer next_hop_target, - const char *next_hop_target_property, + const gchar *next_hop_target_property, gpointer metric_target, - const char *metric_target_property, + const gchar *metric_target_property, GBindingFlags flags) { g_object_bind_property_full (source, source_property, diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index 174fb929..72bd91e3 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -23,33 +23,33 @@ void nm_editor_bindings_init (void); void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer target, - const char *target_property, + const gchar *target_property, GBindingFlags flags); void nm_editor_bind_ip_addresses_to_strv (int family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer target, - const char *target_property, + const gchar *target_property, GBindingFlags flags); void nm_editor_bind_ip_gateway_to_string (int family, NMSettingIPConfig *source, gpointer target, - const char *target_property, - const char *target_sensitive_property, + const gchar *target_property, + const gchar *target_sensitive_property, GBindingFlags flags); void nm_editor_bind_ip_route_to_strings (int family, gpointer source, - const char *source_property, + const gchar *source_property, gpointer dest_target, - const char *dest_target_property, + const gchar *dest_target_property, gpointer next_hop_target, - const char *next_hop_target_property, + const gchar *next_hop_target_property, gpointer metric_target, - const char *metric_target_property, + const gchar *metric_target_property, GBindingFlags flags); void nm_editor_bind_wireless_security_method (NMConnection *connection, diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 9dd95c08..8fecefa8 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -33,7 +33,7 @@ static GSList *vpn_plugins; -static int +static gint sort_vpn_plugins (gconstpointer a, gconstpointer b) { NMVpnEditorPlugin *aa = NM_VPN_EDITOR_PLUGIN (a); @@ -93,7 +93,7 @@ typedef struct { gboolean no_autoconnect; } NMEditorConnectionTypeDataReal; -static int +static gint sort_types (gconstpointer a, gconstpointer b) { NMEditorConnectionTypeData *typea = *(NMEditorConnectionTypeData **)a; diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c index 563abf76..0b0b30ea 100644 --- a/clients/tui/nmt-page-ip-tunnel.c +++ b/clients/tui/nmt-page-ip-tunnel.c @@ -94,7 +94,7 @@ add_offset (GBinding *binding, gpointer user_data) { guint v; - int offset = GPOINTER_TO_INT (user_data); + gint offset = GPOINTER_TO_INT (user_data); g_return_val_if_fail (G_VALUE_HOLDS (from_value, G_TYPE_UINT), FALSE); g_return_val_if_fail (G_VALUE_HOLDS (to_value, G_TYPE_UINT), FALSE); -- cgit 1.3.0-6-gf8a5