From 7eae2e49e62834cfff13cc2ee10b37eaff38a6fb Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Fri, 10 May 2013 16:58:34 +0100 Subject: tpaw-utils: move EMP_STR_EMPTY to tp-aw and rename it https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- libempathy/empathy-ft-handler.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libempathy/empathy-ft-handler.c') diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 049489c4e..d7e112a2f 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -26,6 +26,7 @@ #include #include +#include #include "empathy-utils.h" @@ -601,7 +602,7 @@ check_hash_incoming (EmpathyFTHandler *handler) HashingData *hash_data; EmpathyFTHandlerPriv *priv = GET_PRIV (handler); - if (!EMP_STR_EMPTY (priv->content_hash)) + if (!TPAW_STR_EMPTY (priv->content_hash)) { hash_data = g_slice_new0 (HashingData); hash_data->total_bytes = priv->total_bytes; @@ -1512,7 +1513,7 @@ empathy_ft_handler_incoming_set_destination (EmpathyFTHandler *handler, /* check if hash is supported. if it isn't, set use_hash to FALSE * anyway, so that clients won't be expecting us to checksum. */ - if (EMP_STR_EMPTY (priv->content_hash) || + if (TPAW_STR_EMPTY (priv->content_hash) || priv->content_hash_type == TP_FILE_HASH_TYPE_NONE) priv->use_hash = FALSE; else -- cgit v1.2.3