From cecbf767e3364d3342aef9b73206d4e29c692953 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 13 May 2009 17:35:25 +0200 Subject: Add empathy_ft_handler_get_use_hash This is needed, as the GConf property might change during the transfer. --- libempathy/empathy-ft-handler.c | 20 +++++++++++++++++++- libempathy/empathy-ft-handler.h | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index a41909570..be1c1a098 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -392,7 +392,7 @@ check_hash_incoming (EmpathyFTHandler *handler) HashingData *hash_data; EmpathyFTHandlerPriv *priv = GET_PRIV (handler); - if (priv->content_hash != NULL) + if (!EMP_STR_EMPTY (priv->content_hash)) { hash_data = g_slice_new0 (HashingData); hash_data->total_bytes = priv->total_bytes; @@ -996,6 +996,9 @@ empathy_ft_handler_new_outgoing (EmpathyContact *contact, CallbacksData *data; EmpathyFTHandlerPriv *priv; + DEBUG ("New handler outgoing, use hash %s", + use_hash ? "True" : "False"); + g_return_if_fail (EMPATHY_IS_CONTACT (contact)); g_return_if_fail (G_IS_FILE (source)); @@ -1090,6 +1093,9 @@ empathy_ft_handler_incoming_set_destination (EmpathyFTHandler *handler, GFile *destination, gboolean use_hash) { + DEBUG ("Set incoming destination, use hash %s", + use_hash ? "True" : "False"); + g_return_if_fail (EMPATHY_IS_FT_HANDLER (handler)); g_return_if_fail (G_IS_FILE (destination)); @@ -1145,6 +1151,18 @@ empathy_ft_handler_get_gfile (EmpathyFTHandler *handler) return priv->gfile; } +gboolean +empathy_ft_handler_get_use_hash (EmpathyFTHandler *handler) +{ + EmpathyFTHandlerPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_FT_HANDLER (handler), FALSE); + + priv = GET_PRIV (handler); + + return priv->use_hash; +} + gboolean empathy_ft_handler_is_incoming (EmpathyFTHandler *handler) { diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index 654c3a6f1..7ad2a9308 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -77,6 +77,7 @@ const char * empathy_ft_handler_get_filename (EmpathyFTHandler *handler); const char * empathy_ft_handler_get_content_type (EmpathyFTHandler *handler); EmpathyContact * empathy_ft_handler_get_contact (EmpathyFTHandler *handler); GFile * empathy_ft_handler_get_gfile (EmpathyFTHandler *handler); +gboolean empathy_ft_handler_get_use_hash (EmpathyFTHandler *handler); gboolean empathy_ft_handler_is_incoming (EmpathyFTHandler *handler); guint64 empathy_ft_handler_get_transferred_bytes (EmpathyFTHandler *handler); guint64 empathy_ft_handler_get_total_bytes (EmpathyFTHandler *handler); -- cgit v1.2.3