[Telepathy-commits] [telepathy-salut/master] Pass the SalutContact to salut_file_transfer_channel_received_file_offer so it can use gibber_file_transfer_new_from_stanza_with_from

[Guillaume Desmottes]

---
 src/salut-file-transfer-channel.c |    6 ++++--
 src/salut-file-transfer-channel.h |    4 +++-
 src/salut-ft-manager.c            |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index f899ab7..bba0f08 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -995,13 +995,15 @@ xmpp_connection_manager_new_connection_cb (SalutXmppConnectionManager *mgr,
 gboolean
 salut_file_transfer_channel_received_file_offer (SalutFileTransferChannel *self,
                                                  GibberXmppStanza *stanza,
-                                                 GibberXmppConnection *conn)
+                                                 GibberXmppConnection *conn,
+                                                 SalutContact *contact)
 {
   GibberFileTransfer *ft;
 
   salut_xmpp_connection_manager_take_connection (
       self->priv->xmpp_connection_manager , conn);
-  ft = gibber_file_transfer_new_from_stanza (stanza, conn);
+  ft = gibber_file_transfer_new_from_stanza_with_from (stanza, conn,
+    contact->name);
 
   if (ft == NULL)
     {
diff --git a/src/salut-file-transfer-channel.h b/src/salut-file-transfer-channel.h
index d27ef8c..5b6330f 100644
--- a/src/salut-file-transfer-channel.h
+++ b/src/salut-file-transfer-channel.h
@@ -30,6 +30,8 @@
 #include <extensions/_gen/interfaces.h>
 #include <extensions/_gen/enums.h>
 
+#include "salut-contact.h"
+
 G_BEGIN_DECLS
 
 typedef struct _SalutFileTransferChannel SalutFileTransferChannel;
@@ -67,7 +69,7 @@ GType salut_file_transfer_channel_get_type (void);
 
 gboolean salut_file_transfer_channel_received_file_offer (
     SalutFileTransferChannel *self, GibberXmppStanza *stanza,
-    GibberXmppConnection *conn);
+    GibberXmppConnection *conn, SalutContact *contact);
 
 gboolean salut_file_transfer_channel_offer_file (SalutFileTransferChannel *self,
     GError **error);
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index 7a15d25..f907173 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -109,7 +109,8 @@ message_stanza_callback (SalutXmppConnectionManager *mgr,
   chan = salut_ft_manager_new_channel (self, handle, FALSE, NULL);
 
   /* This will set the extra properties on the ft channel */
-  if (salut_file_transfer_channel_received_file_offer (chan, stanza, conn))
+  if (salut_file_transfer_channel_received_file_offer (chan, stanza, conn,
+        contact))
     {
       tp_channel_manager_emit_new_channel (self, TP_EXPORTABLE_CHANNEL (chan),
           NULL);
-- 
1.5.6.5