New upstream version 1.12.4 upstream/1.12.4

9 files changed, 20 insertions, 19 deletions

diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index 3b1866c5..c4723c95 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -68,7 +68,7 @@ test_get_state (NMClient *client)
 	return TRUE;
 }
 
-static char *
+static gchar *
 ip4_address_as_string (guint32 ip)
 {
 	char buf[INET_ADDRSTRLEN+1];
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index 016aa638..fabd8818 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -269,10 +269,10 @@ executable(
   link_with: libnm_glib
 )
 
-test(
+run_target(
   'check-local-exports-' + libnm_glib_name,
-  check_exports,
-  args: [libnm_glib.full_path(), linker_script],
+  command: [check_exports, libnm_glib.full_path(), linker_script],
+  depends: libnm_glib
 )
 
 if enable_tests
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index a0cacfde..592818fa 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -51,7 +51,7 @@ typedef struct {
 	NM80211Mode mode;
 	guint32 max_bitrate;
 	guint8 strength;
-	int last_seen;
+	gint last_seen;
 } NMAccessPointPrivate;
 
 enum {
@@ -277,7 +277,7 @@ nm_access_point_get_strength (NMAccessPoint *ap)
  *
  * Since: 1.2
  **/
-int
+gint
 nm_access_point_get_last_seen (NMAccessPoint *ap)
 {
 	g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), -1);
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h
index d25de541..e9a3fc6b 100644
--- a/libnm-glib/nm-access-point.h
+++ b/libnm-glib/nm-access-point.h
@@ -81,7 +81,7 @@ NM80211Mode            nm_access_point_get_mode         (NMAccessPoint *ap);
 guint32                nm_access_point_get_max_bitrate  (NMAccessPoint *ap);
 guint8                 nm_access_point_get_strength     (NMAccessPoint *ap);
 NM_AVAILABLE_IN_1_2
-int                    nm_access_point_get_last_seen    (NMAccessPoint *ap);
+gint                   nm_access_point_get_last_seen    (NMAccessPoint *ap);
 
 GSList *               nm_access_point_filter_connections (NMAccessPoint *ap,
                                                            const GSList *connections);
diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index 3465475a..cda36016 100644
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -48,9 +48,9 @@ typedef struct {
 	GPtrArray *nsps;
 
 	guint center_freq;
-	int rssi;
-	int cinr;
-	int tx_power;
+	gint rssi;
+	gint cinr;
+	gint tx_power;
 	char *bsid;
 } NMDeviceWimaxPrivate;
 
@@ -299,7 +299,7 @@ nm_device_wimax_get_center_frequency (NMDeviceWimax *self)
  *
  * Deprecated: 1.2: WiMAX is no longer supported.
  **/
-int
+gint
 nm_device_wimax_get_rssi (NMDeviceWimax *self)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
@@ -320,7 +320,7 @@ nm_device_wimax_get_rssi (NMDeviceWimax *self)
  *
  * Deprecated: 1.2: WiMAX is no longer supported.
  **/
-int
+gint
 nm_device_wimax_get_cinr (NMDeviceWimax *self)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
@@ -341,7 +341,7 @@ nm_device_wimax_get_cinr (NMDeviceWimax *self)
  *
  * Deprecated: 1.2: WiMAX is no longer supported.
  **/
-int
+gint
 nm_device_wimax_get_tx_power (NMDeviceWimax *self)
 {
 	g_return_val_if_fail (NM_IS_DEVICE_WIMAX (self), 0);
diff --git a/libnm-glib/nm-device-wimax.h b/libnm-glib/nm-device-wimax.h
index 21d28117..24e46348 100644
--- a/libnm-glib/nm-device-wimax.h
+++ b/libnm-glib/nm-device-wimax.h
@@ -96,11 +96,11 @@ const GPtrArray *nm_device_wimax_get_nsps        (NMDeviceWimax *wimax);
 NM_DEPRECATED_IN_1_2
 guint            nm_device_wimax_get_center_frequency (NMDeviceWimax *self);
 NM_DEPRECATED_IN_1_2
-int              nm_device_wimax_get_rssi        (NMDeviceWimax *self);
+gint             nm_device_wimax_get_rssi        (NMDeviceWimax *self);
 NM_DEPRECATED_IN_1_2
-int              nm_device_wimax_get_cinr        (NMDeviceWimax *self);
+gint             nm_device_wimax_get_cinr        (NMDeviceWimax *self);
 NM_DEPRECATED_IN_1_2
-int              nm_device_wimax_get_tx_power    (NMDeviceWimax *self);
+gint             nm_device_wimax_get_tx_power    (NMDeviceWimax *self);
 NM_DEPRECATED_IN_1_2
 const char *     nm_device_wimax_get_bsid        (NMDeviceWimax *self);
 
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index e2c96d62..5956b344 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -551,7 +551,7 @@ deferred_notify_cb (gpointer data)
 	for (iter = props; iter; iter = g_slist_next (iter)) {
 		NotifyItem *item = iter->data;
 		char buf[50];
-		int ret = 0;
+		gint ret = 0;
 
 		switch (item->pending) {
 		case NOTIFY_SIGNAL_PENDING_ADDED:
diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c
index ca652d1b..d53c9834 100644
--- a/libnm-glib/nm-vpn-plugin-utils.c
+++ b/libnm-glib/nm-vpn-plugin-utils.c
@@ -66,7 +66,7 @@ nm_vpn_plugin_utils_read_vpn_details (int fd,
 	gboolean success = FALSE;
 	char *key = NULL, *val = NULL;
 	GString *line;
-	char c;
+	gchar c;
 
 	if (out_data)
 		g_return_val_if_fail (*out_data == NULL, FALSE);
diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build
index 3fd37c4f..34779018 100644
--- a/libnm-glib/tests/meson.build
+++ b/libnm-glib/tests/meson.build
@@ -19,7 +19,8 @@ foreach test_unit: test_units
     c_args:
       common_cflags + [
         '-DNETWORKMANAGER_COMPILATION_TEST',
-      ],
+      ] +
+      nm_build_cflags,
   )
 
   test(