New upstream version 1.16.0 upstream/1.16.0

17 files changed, 50 insertions, 53 deletions

diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 2aa2e357..b4f8b97f 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -132,7 +132,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_UNKNOWN: unknown device
  * @NM_DEVICE_TYPE_GENERIC: generic support for unrecognized device types
  * @NM_DEVICE_TYPE_ETHERNET: a wired ethernet device
- * @NM_DEVICE_TYPE_WIFI: an 802.11 WiFi device
+ * @NM_DEVICE_TYPE_WIFI: an 802.11 Wi-Fi device
  * @NM_DEVICE_TYPE_UNUSED1: not used
  * @NM_DEVICE_TYPE_UNUSED2: not used
  * @NM_DEVICE_TYPE_BT: a Bluetooth device supporting PAN or DUN access protocols
@@ -356,7 +356,7 @@ typedef enum { /*< flags >*/
  *   setting physical link properties, and anything else required to connect
  *   to the requested network.
  * @NM_DEVICE_STATE_CONFIG: the device is connecting to the requested network.
- *   This may include operations like associating with the WiFi AP, dialing
+ *   This may include operations like associating with the Wi-Fi AP, dialing
  *   the modem, connecting to the remote Bluetooth device, etc.
  * @NM_DEVICE_STATE_NEED_AUTH: the device requires more information to continue
  *   connecting to the requested network.  This includes secrets like WiFi
@@ -449,7 +449,7 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: A dependency of the connection failed
  * @NM_DEVICE_STATE_REASON_BR2684_FAILED: Problem with the RFC 2684 Ethernet over ADSL bridge
  * @NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: ModemManager not running
- * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The WiFi network could not be found
+ * @NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: The Wi-Fi network could not be found
  * @NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: A secondary connection of the base connection failed
  * @NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: DCB or FCoE setup failed
  * @NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: teamd control failed
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index 44d9e735..468064c1 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -30,17 +30,17 @@ enums_headers = [version_header] + files(
   'nm-setting-wireless.h',
   'nm-setting-wireless-security.h',
   'nm-utils.h',
-  'nm-version.h'
+  'nm-version.h',
 )
 
 headers = enums_headers + files(
   'NetworkManager.h',
-  'NetworkManagerVPN.h'
+  'NetworkManagerVPN.h',
 )
 
 install_headers(
   headers,
-  subdir: nm_name
+  subdir: nm_name,
 )
 
 enum_types = 'nm-utils-enum-types'
@@ -52,7 +52,7 @@ libnm_utils_enum = gnome.mkenums(
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template',
   install_header: true,
-  install_dir: nm_pkgincludedir
+  install_dir: nm_pkgincludedir,
 )
 
 sources = files(
@@ -87,15 +87,14 @@ sources = files(
   'nm-setting-vlan.c',
   'nm-setting-vpn.c',
   'nm-utils.c',
-  'nm-value-transforms.c'
+  'nm-value-transforms.c',
 )
-sources += shared_files_libnm_util
 
 deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_dep,
-  uuid_dep
+  shared_nm_utils_base_dep,
+  uuid_dep,
 ]
 
 common_cflags = [
@@ -103,7 +102,7 @@ common_cflags = [
 ]
 
 cflags = common_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name),
 ]
 
 if crypto_gnutls_dep.found()
@@ -111,7 +110,7 @@ if crypto_gnutls_dep.found()
     'nm-util-crypto-gnutls',
     sources: [ 'crypto_gnutls.c' ],
     dependencies: deps + [ crypto_gnutls_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -120,7 +119,7 @@ if crypto_nss_dep.found()
     'nm-util-crypto-nss',
     sources: [ 'crypto_nss.c' ],
     dependencies: deps + [ crypto_nss_dep ],
-    c_args: cflags
+    c_args: cflags,
   )
 endif
 
@@ -145,13 +144,13 @@ libnm_util = shared_library(
   ],
   link_depends: linker_script,
   link_with: libnm_util_crypto,
-  install: true
+  install: true,
 )
 
 libnm_util_dep = declare_dependency(
   sources: libnm_utils_enum[1],
   include_directories: libnm_util_inc,
-  link_with: libnm_util
+  link_with: libnm_util,
 )
 
 pkg.generate(
@@ -162,7 +161,7 @@ pkg.generate(
   filebase: libnm_util_name,
   subdirs: nm_name,
   requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1',
-  variables: 'exec_prefix=${prefix}'
+  variables: 'exec_prefix=${prefix}',
 )
 
 if enable_introspection
@@ -170,7 +169,7 @@ if enable_introspection
 
   gir_includes = [
     'DBusGLib-1.0',
-    'GObject-2.0'
+    'GObject-2.0',
   ]
 
   libnm_util_gir = gnome.generate_gir(
@@ -182,12 +181,12 @@ if enable_introspection
     symbol_prefix: nm_id_prefix.to_lower(),
     export_packages: libnm_util_name,
     includes: gir_includes,
-    install: true
+    install: true,
   )
 
   libnm_util_gir_dep = declare_dependency(
     sources: libnm_util_gir,
-    link_with: libnm_util
+    link_with: libnm_util,
   )
 endif
 
@@ -202,7 +201,7 @@ sources = files(
 )
 
 deps = [
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 libtest_crypto = static_library(
@@ -210,7 +209,7 @@ libtest_crypto = static_library(
   sources: sources,
   dependencies: deps,
   link_with: libnm_util_crypto,
-  c_args: cflags
+  c_args: cflags,
 )
 
 if enable_tests
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 6e119c2c..9bee219e 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -100,7 +100,7 @@ typedef enum
 
 /*
  * NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD: overwrite the ip6 method
- * when normalizing ip6 configuration. If omited, this defaults to
+ * when normalizing ip6 configuration. If omitted, this defaults to
  * @NM_SETTING_IP6_CONFIG_METHOD_AUTO.
  */
 #define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index dfc8ea98..8581ecc5 100644
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -539,9 +539,9 @@ _gvalues_compare (const GValue *value1, const GValue *value2)
 		if (p1 == p2)
 			ret = 0; /* Exactly the same values */
 		else if (!p1)
-			ret = 1; /* The comparision functions below don't handle NULLs */
+			ret = 1; /* The comparison functions below don't handle NULLs */
 		else if (!p2)
-			ret = -1; /* The comparision functions below don't handle NULLs */
+			ret = -1; /* The comparison functions below don't handle NULLs */
 		else if (type1 == G_TYPE_STRV)
 			ret = _gvalues_compare_strv (value1, value2);
 		else if (dbus_g_type_is_collection (type1))
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index ae7a47e6..805a5d25 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -435,7 +435,7 @@ get_cert_scheme (GByteArray *array)
 	    && !memcmp (array->data, SCHEME_PATH, NM_STRLEN (SCHEME_PATH))) {
 		/* But it must also be NUL terminated, contain at least
 		 * one non-NUL character, and contain only one trailing NUL
-		 * chracter.
+		 * character.
 		 * And ensure it's UTF-8 valid too so we can pass it through
 		 * D-Bus and stuff like that. */
 		if (   array->len > NM_STRLEN (SCHEME_PATH) + 1
@@ -3723,7 +3723,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	/* Initialize crypto lbrary. */
 	if (!nm_utils_init (&error)) {
-		g_warning ("Couldn't initilize nm-utils/crypto system: %s",
+		g_warning ("Couldn't initialize nm-utils/crypto system: %s",
 		           error->message);
 		g_error_free (error);
 	}
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index a54e93c3..9a1c5c73 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index cc189c57..ceebb982 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -254,7 +254,7 @@ nm_setting_bridge_get_ageing_time (NMSettingBridge *setting)
 #define BR_MIN_AGEING_TIME   0
 #define BR_MAX_AGEING_TIME   1000000
 
-static inline gboolean
+static gboolean
 check_range (guint32 val,
              guint32 min,
              guint32 max,
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index c7da1aa4..4750733f 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -294,7 +294,7 @@ nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
  * @setting: the #NMSettingConnection
  * @idx: the zero-based index of the permissions entry
  * @out_ptype: on return, the permission type (at this time, always "user")
- * @out_pitem: on return, the permission item (formatted accoring to @ptype, see
+ * @out_pitem: on return, the permission item (formatted according to @ptype, see
  * #NMSettingConnection:permissions for more detail
  * @out_detail: on return, the permission detail (at this time, always %NULL)
  *
@@ -646,7 +646,7 @@ nm_setting_connection_get_secondary (NMSettingConnection *setting, guint32 idx)
  * @setting: the #NMSettingConnection
  * @sec_uuid: the secondary connection UUID to add
  *
- * Adds a new secondary connetion UUID to the setting.
+ * Adds a new secondary connection UUID to the setting.
  *
  * Returns: %TRUE if the secondary connection UUID was added; %FALSE if the UUID
  * was already present
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index 17a3a871..c3cf89dd 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -802,7 +802,7 @@ nm_setting_dcb_init (NMSettingDcb *setting)
 {
 }
 
-static inline void
+static void
 set_uint_array (const GValue *v, uint *a, size_t len)
 {
 	GArray *src = g_value_get_boxed (v);
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 1fed9eca..626ba4ca 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -22,7 +22,6 @@
 #include "nm-default.h"
 
 #include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 00d35a2f..33598dfe 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -407,7 +407,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting
  * Removes an encryption algorithm from the allowed pairwise encryption
  * algorithm list.
  *
- * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not.
+ * Returns: %TRUE if the encryption algorithm was found and removed; %FALSE if it was not.
  *
  * Since: 0.9.10
  **/
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 1140582b..cbeeb9bf 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/libnm-util/nm-setting-wireless-security.h
@@ -79,9 +79,9 @@ GQuark nm_setting_wireless_security_error_quark (void);
  * @NM_WEP_KEY_TYPE_LAST: placeholder value for bounds-checking
  *
  * The #NMWepKeyType values specify how any WEP keys present in the setting
- * are intepreted.  There are no standards governing how to hash the various WEP
+ * are interpreted.  There are no standards governing how to hash the various WEP
  * key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
- * can be interpreted in multiple ways, requring the setting to specify how to
+ * can be interpreted in multiple ways, requiring the setting to specify how to
  * interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
  * is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
  * ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 9147dfe1..3edf4005 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -650,7 +650,7 @@ nm_setting_compare (NMSetting *a,
 	return same;
 }
 
-static inline gboolean
+static gboolean
 should_compare_prop (NMSetting *setting,
                      const char *prop_name,
                      NMSettingCompareFlags comp_flags,
@@ -674,7 +674,7 @@ should_compare_prop (NMSetting *setting,
 		    && g_strcmp0 (prop_name, NM_SETTING_VPN_SECRETS) == 0) {
 			/* FIXME: NMSettingVPN:NM_SETTING_VPN_SECRETS has NM_SETTING_PARAM_SECRET.
 			 * nm_setting_get_secret_flags() quite possibly fails, but it might succeed if the
-			 * setting accidently uses a key "secrets". */
+			 * setting accidentally uses a key "secrets". */
 			return FALSE;
 		}
 
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index d235efbd..d70445a2 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -91,7 +91,7 @@ GQuark nm_setting_error_quark (void);
  * should be requested from the user each time it is needed
  * @NM_SETTING_SECRET_FLAG_NOT_REQUIRED: in situations where it cannot be
  * automatically determined that the secret is required (some VPNs and PPP
- * providers dont require all secrets) this flag indicates that the specific
+ * providers don't require all secrets) this flag indicates that the specific
  * secret is not required
  *
  * These flags indicate specific behavior related to handling of a secret.  Each
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 054d69f4..eae80a04 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -103,7 +103,7 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
 	{ "bg",         {"windows-1251","koi8-r",               "iso-8859-5"} },        /* Bulgarian */
 	{ "mk",         {"koi8-r",      "windows-1251", "iso-8859-5"} },        /* Macedonian */
 	{ "sr",         {"koi8-r",      "windows-1251", "iso-8859-5"} },        /* Serbian */
-	{ "uk",         {"koi8-u",      "koi8-r",                       "windows-1251"} },      /* Ukranian */
+	{ "uk",         {"koi8-u",      "koi8-r",                       "windows-1251"} },      /* Ukrainian */
 
 	/* Arabic */
 	{ "ar",         {"iso-8859-6",  "windows-1256", NULL} },
@@ -600,7 +600,7 @@ device_supports_ap_ciphers (guint32 dev_caps,
 
 /**
  * nm_utils_ap_mode_security_valid:
- * @type: the security type to check device capabilties against,
+ * @type: the security type to check device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
@@ -638,16 +638,16 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
 
 /**
  * nm_utils_security_valid:
- * @type: the security type to check AP flags and device capabilties against,
+ * @type: the security type to check AP flags and device capabilities against,
  * e.g. #NMU_SEC_STATIC_WEP
  * @wifi_caps: bitfield of the capabilities of the specific Wi-Fi device, e.g.
  * #NM_WIFI_DEVICE_CAP_CIPHER_WEP40
  * @have_ap: whether the @ap_flags, @ap_wpa, and @ap_rsn arguments are valid
  * @adhoc: whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
  * @ap_flags: bitfield of AP capabilities, e.g. #NM_802_11_AP_FLAGS_PRIVACY
- * @ap_wpa: bitfield of AP capabilties derived from the AP's WPA beacon,
+ * @ap_wpa: bitfield of AP capabilities derived from the AP's WPA beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_TKIP | #NM_802_11_AP_SEC_KEY_MGMT_PSK)
- * @ap_rsn: bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+ * @ap_rsn: bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
  * e.g. (#NM_802_11_AP_SEC_PAIR_CCMP | #NM_802_11_AP_SEC_PAIR_TKIP)
  *
  * Given a set of device capabilities, and a desired security type to check
@@ -657,7 +657,7 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
  * NOTE: this function cannot handle checking security for AP/Hotspot mode;
  * use nm_utils_ap_mode_security_valid() instead.
  *
- * Returns: %TRUE if the device capabilities and AP capabilties intersect and are
+ * Returns: %TRUE if the device capabilities and AP capabilities intersect and are
  * compatible with the desired @type, %FALSE if they are not
  **/
 gboolean
@@ -1736,7 +1736,7 @@ nm_utils_file_is_pkcs12 (const char *filename)
  * @predicate: (scope call): if given, pass the file name to this function
  *   for additional checks. This check is performed after the check for
  *   @file_test_flags. You cannot omit both @file_test_flags and @predicate.
- * @user_data: (closure): (allow-none): user data for @predicate function.
+ * @user_data: (closure) (allow-none): user data for @predicate function.
  * @error: (allow-none): on failure, set a "not found" error %G_IO_ERROR %G_IO_ERROR_NOT_FOUND.
  *
  * Searches for a @progname file in a list of search @paths.
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 49c35a51..5e8b84fa 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -2,7 +2,7 @@ deps = [
   dbus_dep,
   dbus_glib_dep,
   libnm_util_dep,
-  shared_dep
+  shared_nm_utils_base_dep,
 ]
 
 cflags = common_cflags + [
@@ -15,7 +15,7 @@ test_libnm_linking = executable(
   test,
   test + '.c',
   dependencies: deps + [libnm_dep],
-  c_args: cflags
+  c_args: cflags,
 )
 
 test_units = [
@@ -24,7 +24,7 @@ test_units = [
   ['test-secrets', [], []],
   ['test-setting-8021x', [], []],
   ['test-setting-dcb', [], []],
-  ['test-settings-defaults', [], []]
+  ['test-settings-defaults', [], []],
 ]
 
 foreach test_unit: test_units
@@ -34,12 +34,12 @@ foreach test_unit: test_units
     dependencies: deps,
     c_args: cflags,
     link_with: test_unit[1],
-    link_depends: test_unit[2]
+    link_depends: test_unit[2],
   )
 
   test(
     'libnm-util/' + test_unit[0],
     test_script,
-    args: test_args + [exe.full_path()]
+    args: test_args + [exe.full_path()],
   )
 endforeach
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 304797a9..9e097f19 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -2314,7 +2314,7 @@ test_connection_verify_sets_interface_name (void)
 
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, NULL);
 
-	/* for backward compatiblity, normalizes the interface name */
+	/* for backward compatibility, normalizes the interface name */
 	success = nm_connection_verify (con, &error);
 	g_assert (success && !error);
 
@@ -2373,7 +2373,7 @@ test_connection_normalize_virtual_iface_name (void)
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, IFACE_NAME);
 	g_assert_cmpstr (nm_setting_vlan_get_interface_name (s_vlan), ==, IFACE_VIRT);
 
-	/* for backward compatiblity, normalizes the interface name */
+	/* for backward compatibility, normalizes the interface name */
 	success = nm_connection_verify (con, &error);
 	g_assert (success && !error);