diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
| commit | 33491bc4279481db8ae47213e34a6d695a0e8830 (patch) | |
| tree | 097d2b0fdff3fae6885381ae5e57a182cd8cbbba /libnm-glib/libnm-glib-test.c | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Imported Upstream version 0.9.10.0 upstream/0.9.10.0
Diffstat (limited to 'libnm-glib/libnm-glib-test.c')
| -rw-r--r-- | libnm-glib/libnm-glib-test.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 4e80806f..e38457f0 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -70,16 +70,16 @@ static gchar * ip4_address_as_string (guint32 ip) { char buf[INET_ADDRSTRLEN+1]; - struct in_addr tmp_addr; + guint32 tmp_addr; memset (&buf, '\0', sizeof (buf)); - tmp_addr.s_addr = ip; + tmp_addr = ip; if (inet_ntop (AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN)) { return g_strdup (buf); } else { g_warning ("%s: error converting IP4 address 0x%X", - __func__, ntohl (tmp_addr.s_addr)); + __func__, ntohl (tmp_addr)); return NULL; } } @@ -173,7 +173,7 @@ dump_access_point (NMAccessPoint *ap) g_print ("\tSsid: %s\n", ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); - str = nm_access_point_get_hw_address (ap); + str = nm_access_point_get_bssid (ap); g_print ("\tMAC Address: %s\n", str); g_print ("\tFlags: 0x%X\n", nm_access_point_get_flags (ap)); @@ -390,7 +390,9 @@ main (int argc, char *argv[]) { NMClient *client; +#if !GLIB_CHECK_VERSION (2, 35, 0) g_type_init (); +#endif client = nm_client_new (); if (!client) { |