[Telepathy-commits] [telepathy-salut/master] add gibber_file_transfer_new_from_stanza_with_from

[Guillaume Desmottes]

---
 lib/gibber/gibber-file-transfer.c |   21 ++++++++++++++++++---
 lib/gibber/gibber-file-transfer.h |    4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/gibber/gibber-file-transfer.c b/lib/gibber/gibber-file-transfer.c
index 8be767c..44cf879 100644
--- a/lib/gibber/gibber-file-transfer.c
+++ b/lib/gibber/gibber-file-transfer.c
@@ -349,14 +349,17 @@ gibber_file_transfer_is_file_offer (GibberXmppStanza *stanza)
 }
 
 GibberFileTransfer *
-gibber_file_transfer_new_from_stanza (GibberXmppStanza *stanza,
-                                      GibberXmppConnection *connection)
+gibber_file_transfer_new_from_stanza_with_from (
+    GibberXmppStanza *stanza,
+    GibberXmppConnection *connection,
+    const gchar *from)
 {
   /* FIXME put the known backends in a list and stop when the first one
    * can handle the stanza */
   GibberFileTransfer *ft;
 
-  ft = gibber_oob_file_transfer_new_from_stanza (stanza, connection);
+  ft = gibber_oob_file_transfer_new_from_stanza_with_from (stanza, connection,
+      from);
   /* it's not possible to have an outgoing transfer created from
    * a stanza */
   g_assert (ft == NULL ||
@@ -365,6 +368,18 @@ gibber_file_transfer_new_from_stanza (GibberXmppStanza *stanza,
   return ft;
 }
 
+GibberFileTransfer *
+gibber_file_transfer_new_from_stanza (GibberXmppStanza *stanza,
+                                      GibberXmppConnection *connection)
+{
+  const gchar *from;
+
+  from = gibber_xmpp_node_get_attribute (stanza->node, "from");
+
+  return gibber_file_transfer_new_from_stanza_with_from (stanza, connection,
+      from);
+}
+
 void
 gibber_file_transfer_offer (GibberFileTransfer *self)
 {
diff --git a/lib/gibber/gibber-file-transfer.h b/lib/gibber/gibber-file-transfer.h
index 9c71692..07acc6a 100644
--- a/lib/gibber/gibber-file-transfer.h
+++ b/lib/gibber/gibber-file-transfer.h
@@ -104,8 +104,12 @@ GType gibber_file_transfer_get_type (void);
 
 
 gboolean gibber_file_transfer_is_file_offer (GibberXmppStanza *stanza);
+
 GibberFileTransfer *gibber_file_transfer_new_from_stanza (
     GibberXmppStanza *stanza, GibberXmppConnection *connection);
+GibberFileTransfer *gibber_file_transfer_new_from_stanza_with_from (
+    GibberXmppStanza *stanza, GibberXmppConnection *connection,
+    const gchar *from);
 
 void gibber_file_transfer_offer (GibberFileTransfer *self);
 void gibber_file_transfer_send (GibberFileTransfer *self, GIOChannel *src);
-- 
1.5.6.5