diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-02 00:07:13 +0800 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-02 00:07:13 +0800 |
commit | 3623b886388ccb1a581177c096a1668b26fdadd1 (patch) | |
tree | 640a6711a116e3ea254e0090960785271fc77d33 /src/empathy-event-manager.c | |
parent | b06c101e97689187240ea55fe1d3e399ed0960e0 (diff) | |
parent | 17fec9762e1680828a73efb59f7ed155219763ac (diff) | |
download | gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar.gz gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar.bz2 gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar.lz gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar.xz gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.tar.zst gsoc2013-empathy-3623b886388ccb1a581177c096a1668b26fdadd1.zip |
Merge branch 'ft_rework'
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r-- | src/empathy-event-manager.c | 51 |
1 files changed, 37 insertions, 14 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index bd31b193e..abdd6db8b 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -752,6 +752,32 @@ event_manager_muc_invite_got_contact_cb (EmpathyTpContactFactory *factory, } static void +event_manager_ft_got_contact_cb (EmpathyTpContactFactory *factory, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *object) +{ + EventManagerApproval *approval = (EventManagerApproval *) user_data; + char *header; + + approval->contact = contact; + + header = g_strdup_printf (_("Incoming file transfer from %s"), + empathy_contact_get_name (approval->contact)); + + event_manager_add (approval->manager, approval->contact, + EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, approval, + event_channel_process_func, NULL); + + /* FIXME better sound for incoming file transfers ?*/ + empathy_sound_play (empathy_main_window_get (), + EMPATHY_SOUND_CONVERSATION_NEW); + + g_free (header); +} + +static void event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, EmpathyDispatchOperation *operation, EmpathyEventManager *manager) { @@ -839,23 +865,20 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, } else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) { - EmpathyTpFile *file; - gchar *header; - - file = EMPATHY_TP_FILE (empathy_dispatch_operation_get_channel_wrapper (operation)); - approval->contact = g_object_ref (empathy_tp_file_get_contact (file)); - - header = g_strdup_printf (_("Incoming file transfer from %s"), - empathy_contact_get_name (approval->contact)); + TpChannel *channel; + TpConnection *connection; + TpHandle handle; + EmpathyTpContactFactory *factory; - event_manager_add (manager, approval->contact, EMPATHY_IMAGE_DOCUMENT_SEND, - header, NULL, approval, event_channel_process_func, NULL); + channel = empathy_dispatch_operation_get_channel (operation); + handle = tp_channel_get_handle (channel, NULL); - /* FIXME better sound for incoming file transfers ?*/ - empathy_sound_play (empathy_main_window_get (), - EMPATHY_SOUND_CONVERSATION_NEW); + connection = tp_channel_borrow_connection (channel); + factory = empathy_tp_contact_factory_dup_singleton (connection); + empathy_tp_contact_factory_get_from_handle (factory, handle, + event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (manager)); - g_free (header); + g_object_unref (factory); } else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE) || !tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE)) |