]> git.0d.be Git - empathy.git/commitdiff
Fix the build.
authorCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Mon, 9 Feb 2009 14:22:08 +0000 (15:22 +0100)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 1 Jun 2009 15:46:04 +0000 (17:46 +0200)
libempathy/empathy-ft-handler.c
libempathy/empathy-ft-handler.h

index 193b8d60319811066440a2b19c961f9798454a24..9c5243a915a049ebb1b05ed5b8ae2559602a0845 100644 (file)
@@ -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);
 
index 57dcc0c89a9fa5d97a1f5f23d555f7feab897c7a..c95e71c32aba42ecba8de80a97b4667368cd0748 100644 (file)
@@ -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