[glib-networking] gnutls: update for g_byte_get_data() change in git master
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] gnutls: update for g_byte_get_data() change in git master
- Date: Thu, 15 Dec 2011 16:14:38 +0000 (UTC)
commit 3e86025610bed342c53a1e596fca0da9288c5949
Author: Dan Winship <danw gnome org>
Date: Thu Dec 15 11:14:16 2011 -0500
gnutls: update for g_byte_get_data() change in git master
tls/gnutls/gtlsclientconnection-gnutls.c | 2 +-
tls/gnutls/gtlsserverconnection-gnutls.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tls/gnutls/gtlsclientconnection-gnutls.c b/tls/gnutls/gtlsclientconnection-gnutls.c
index 2292d05..6ff6383 100644
--- a/tls/gnutls/gtlsclientconnection-gnutls.c
+++ b/tls/gnutls/gtlsclientconnection-gnutls.c
@@ -284,7 +284,7 @@ g_tls_client_connection_gnutls_begin_handshake (GTlsConnectionGnutls *conn)
if (session_data)
{
gnutls_session_set_data (g_tls_connection_gnutls_get_session (conn),
- g_bytes_get_data (session_data),
+ g_bytes_get_data (session_data, NULL),
g_bytes_get_size (session_data));
g_bytes_unref (session_data);
}
diff --git a/tls/gnutls/gtlsserverconnection-gnutls.c b/tls/gnutls/gtlsserverconnection-gnutls.c
index 807895b..2f05ecf 100644
--- a/tls/gnutls/gtlsserverconnection-gnutls.c
+++ b/tls/gnutls/gtlsserverconnection-gnutls.c
@@ -273,7 +273,7 @@ g_tls_server_connection_gnutls_db_retrieve (void *user_data,
{
data.size = g_bytes_get_size (session_data);
data.data = gnutls_malloc (data.size);
- memcpy (data.data, g_bytes_get_data (session_data), data.size);
+ memcpy (data.data, g_bytes_get_data (session_data, NULL), data.size);
g_bytes_unref (session_data);
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]