diff options
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-ft-handler.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 193b8d603..9c5243a91 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -27,6 +27,7 @@ #include "empathy-ft-handler.h" #include "empathy-dispatcher.h" +#include "empathy-marshal.h" #include "empathy-utils.h" G_DEFINE_TYPE (EmpathyFTHandler, empathy_ft_handler, G_TYPE_OBJECT) @@ -49,6 +50,7 @@ enum { TRANSFER_PROGRESS, TRANSFER_DONE, TRANSFER_ERROR, + LAST_SIGNAL }; typedef struct { @@ -75,6 +77,8 @@ typedef struct { GCancellable *cancellable; } EmpathyFTHandlerPriv; +static guint signals[LAST_SIGNAL] = { 0 }; + /* prototypes */ static void schedule_hash_chunk (HashingData *hash_data); @@ -157,7 +161,7 @@ do_dispose (GObject *object) g_object_unref (priv->cancellable); priv->cancellable = NULL; } - + G_OBJECT_CLASS (empathy_ft_handler_parent_class)->dispose (object); } @@ -217,7 +221,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[TRANSFER_ERROR] = g_signal_new ("transfer-error", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT_POINTER, + _empathy_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, EMPATHY_TYPE_TP_FILE, G_TYPE_POINTER); diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index 57dcc0c89..c95e71c32 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -60,7 +60,8 @@ EmpathyFTHandler * empathy_ft_handler_new_outgoing (EmpathyContact *contact, GFile *source); EmpathyFTHandler * empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file, GFile *destination); -void empathy_ft_handler_start_transfer (EmpathyFTHandler *handler); +void empathy_ft_handler_start_transfer (EmpathyFTHandler *handler, + GCancellable *cancellable); G_END_DECLS |