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 /nautilus-sendto-plugin/empathy-nautilus-sendto.c | |
| 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 'nautilus-sendto-plugin/empathy-nautilus-sendto.c')
| -rw-r--r-- | nautilus-sendto-plugin/empathy-nautilus-sendto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 2f38b8325..ee1519de3 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -33,7 +33,6 @@ #include <libempathy/empathy-debug.h> #include <libempathy/empathy-ft-factory.h> #include <libempathy/empathy-ft-handler.h> -#include <libempathy/empathy-tp-file.h> #include <libempathy-gtk/empathy-contact-chooser.h> #include <libempathy-gtk/empathy-ui-utils.h> @@ -166,7 +165,7 @@ quit (void) static void transfer_done_cb (EmpathyFTHandler *handler, - EmpathyTpFile *tp_file, + TpFileTransferChannel *channel, NstPlugin *plugin) { quit (); |