From 1cb6375a1724a4ad46802abb84ccce2295654d6f Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Tue, 25 Oct 2011 09:27:42 -0700 Subject: [PATCH] Replace deprecated g_unix_socket_* functions. --- telepathy-glib/gnio-util.c | 9 ++++++--- tests/gnio-util.c | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/telepathy-glib/gnio-util.c b/telepathy-glib/gnio-util.c index 0b02b5c..bad5a6e 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,8 +207,11 @@ 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; diff --git a/tests/gnio-util.c b/tests/gnio-util.c index 8abcac3..ca92436 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; -- 1.7.7