/* empathy-ft-factory.c */
-#include <glib.h>
+#include "config.h"
+#include "empathy-ft-factory.h"
-#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
-#include "empathy-ft-factory.h"
-#include "empathy-ft-handler.h"
-#include "empathy-marshal.h"
#include "empathy-request-util.h"
#include "empathy-utils.h"
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0,
NULL, NULL,
- _empathy_marshal_VOID__OBJECT_POINTER,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
/**
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0,
NULL, NULL,
- _empathy_marshal_VOID__OBJECT_POINTER,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
}
if (tp_proxy_get_invalidated (channel) != NULL)
continue;
- if (!EMPATHY_IS_TP_FILE (channel))
+ if (!TP_IS_FILE_TRANSFER_CHANNEL (channel))
continue;
/* We handle only incoming FT */
- empathy_ft_handler_new_incoming ((EmpathyTpFile *) channel,
+ empathy_ft_handler_new_incoming ((TpFileTransferChannel *) channel,
ft_handler_incoming_ready_cb, self);
}
am = tp_account_manager_dup ();
priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE,
- EMPATHY_FT_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL);
+ EMPATHY_FT_TP_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, self, NULL);
tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
GError *error,
gpointer user_data)
{
- EmpathyFTFactory *factory = user_data;
+ EmpathyFTFactory *factory = EMPATHY_FT_FACTORY (user_data);
g_signal_emit (factory, signals[NEW_FT_HANDLER], 0, handler, error);
+
+ g_object_unref (factory);
}
/* public methods */
g_return_if_fail (G_IS_FILE (source));
empathy_ft_handler_new_outgoing (contact, source, action_time,
- ft_handler_outgoing_ready_cb, factory);
+ ft_handler_outgoing_ready_cb, g_object_ref (factory));
}
/**