diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
| commit | b5764db7cf39aeaaabc261ece49c57776540a0be (patch) | |
| tree | 7cadc15c0f9c1c9b7ff7d21de7020201add612aa /libempathy/empathy-ft-handler.h | |
| parent | 67869e50ff885ea10280447edbe6ee22520e26cb (diff) | |
| parent | 82b0f4038f7c257253962080270e5625dd5de152 (diff) | |
| download | gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.gz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.bz2 gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.lz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.xz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.zst gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.zip | |
Merge remote-tracking branch 'jonny/ft'
Conflicts:
libempathy/empathy-tp-file.c
Diffstat (limited to 'libempathy/empathy-ft-handler.h')
| -rw-r--r-- | libempathy/empathy-ft-handler.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index a4392b508..7111cd25b 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -27,7 +27,8 @@ #include <glib-object.h> #include <gio/gio.h> -#include "empathy-tp-file.h" +#include <telepathy-glib/file-transfer-channel.h> + #include "empathy-contact.h" G_BEGIN_DECLS @@ -56,6 +57,18 @@ typedef struct { GObjectClass parent_class; } EmpathyFTHandlerClass; +#define EMPATHY_FT_ERROR_QUARK g_quark_from_static_string ("EmpathyFTError") + +typedef enum { + EMPATHY_FT_ERROR_FAILED, + EMPATHY_FT_ERROR_HASH_MISMATCH, + EMPATHY_FT_ERROR_TP_ERROR, + EMPATHY_FT_ERROR_SOCKET, + EMPATHY_FT_ERROR_NOT_SUPPORTED, + EMPATHY_FT_ERROR_INVALID_SOURCE_FILE, + EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE +} EmpathyFTErrorEnum; + /** * EmpathyFTHandlerReadyCallback: * @handler: the handler which is now ready @@ -75,7 +88,7 @@ void empathy_ft_handler_new_outgoing (EmpathyContact *contact, EmpathyFTHandlerReadyCallback callback, gpointer user_data); -void empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file, +void empathy_ft_handler_new_incoming (TpFileTransferChannel *channel, EmpathyFTHandlerReadyCallback callback, gpointer user_data); void empathy_ft_handler_incoming_set_destination (EmpathyFTHandler *handler, |