diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-10-25 09:27:42 -0700 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-10-28 14:32:50 -0700 |
| commit | 9a7d9195dab1035ffe2da0d7cd28c4a06b484881 (patch) | |
| tree | 45ec80e2ae432ed5d51665d00ea263eabe4a4f59 | |
| parent | 2c30c3b8f7a7df8ae78aead13a84e39614471fba (diff) | |
Replace deprecated g_unix_socket_* functions.
https://bugs.freedesktop.org/show_bug.cgi?id=42233
| -rw-r--r-- | telepathy-glib/gnio-util.c | 11 | ||||
| -rw-r--r-- | tests/gnio-util.c | 11 |
2 files changed, 15 insertions, 7 deletions
diff --git a/telepathy-glib/gnio-util.c b/telepathy-glib/gnio-util.c index 0b02b5c4..d08b9f88 100644 --- a/telepathy-glib/gnio-util.c +++ b/telepathy-glib/gnio-util.c @@ -117,8 +117,8 @@ tp_g_socket_address_from_variant (TpSocketAddressType type, { GArray *address = g_value_get_boxed (variant); - addr = g_unix_socket_address_new_abstract ( - address->data, address->len); + addr = g_unix_socket_address_new_with_type ( + address->data, address->len, G_UNIX_SOCKET_ADDRESS_ABSTRACT); } break; #endif /* HAVE_GIO_UNIX */ @@ -207,10 +207,15 @@ tp_address_variant_from_g_socket_address (GSocketAddress *address, const char *path = g_unix_socket_address_get_path (unixaddr); gsize len = g_unix_socket_address_get_path_len (unixaddr); - if (g_unix_socket_address_get_is_abstract (unixaddr)) + if (g_unix_socket_address_get_address_type (unixaddr) == + G_UNIX_SOCKET_ADDRESS_ABSTRACT) + { type = TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX; + } else + { type = TP_SOCKET_ADDRESS_TYPE_UNIX; + } array = g_array_sized_new (TRUE, FALSE, sizeof (char), len); array = g_array_append_vals (array, path, len); diff --git a/tests/gnio-util.c b/tests/gnio-util.c index 8abcac32..ca924367 100644 --- a/tests/gnio-util.c +++ b/tests/gnio-util.c @@ -203,7 +203,8 @@ test_variant_to_sockaddr_unix (void) unixaddr = G_UNIX_SOCKET_ADDRESS (sockaddr); - g_assert (g_unix_socket_address_get_is_abstract (unixaddr) == FALSE); + g_assert (g_unix_socket_address_get_address_type (unixaddr) != + G_UNIX_SOCKET_ADDRESS_ABSTRACT); g_assert_cmpuint (g_unix_socket_address_get_path_len (unixaddr), ==, pathlen); g_assert_cmpstr (g_unix_socket_address_get_path (unixaddr), ==, UNIX_ADDR); @@ -235,7 +236,8 @@ test_variant_to_sockaddr_abstract_unix (void) unixaddr = G_UNIX_SOCKET_ADDRESS (sockaddr); - g_assert (g_unix_socket_address_get_is_abstract (unixaddr) == TRUE); + g_assert (g_unix_socket_address_get_address_type (unixaddr) == + G_UNIX_SOCKET_ADDRESS_ABSTRACT); g_assert_cmpuint (g_unix_socket_address_get_path_len (unixaddr), ==, ABST_ADDR_LEN); g_assert (memcmp (g_unix_socket_address_get_path (unixaddr), ABST_ADDR, @@ -271,8 +273,9 @@ test_sockaddr_to_variant_unix (void) static void test_sockaddr_to_variant_abstract_unix (void) { - GSocketAddress *sockaddr = g_unix_socket_address_new_abstract ( - ABST_ADDR, ABST_ADDR_LEN); + GSocketAddress *sockaddr = g_unix_socket_address_new_with_type ( + ABST_ADDR, ABST_ADDR_LEN, G_UNIX_SOCKET_ADDRESS_ABSTRACT); + GValue *variant; GArray *array; TpSocketAddressType type; |