diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-10 23:58:34 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:06 +0800 |
| commit | 7eae2e49e62834cfff13cc2ee10b37eaff38a6fb (patch) | |
| tree | dd8ce7c22177cd14324b466c2841466c23816ff8 /libempathy/empathy-ft-handler.c | |
| parent | 6609b50bce338fdb3fe470f57727d30211c8d104 (diff) | |
| download | gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar.gz gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar.bz2 gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar.lz gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar.xz gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.tar.zst gsoc2013-empathy-7eae2e49e62834cfff13cc2ee10b37eaff38a6fb.zip | |
tpaw-utils: move EMP_STR_EMPTY to tp-aw and rename it
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy/empathy-ft-handler.c')
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 <glib/gi18n-lib.h> #include <tp-account-widgets/tpaw-time.h> +#include <tp-account-widgets/tpaw-utils.h> #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 |