[Telepathy-commits] [telepathy-salut/master] gibber-oob-file-transfer: remove gibber_oob_file_transfer_new_from_stanza and add gibber_oob_file_transfer_new_from_stanza_with_from instead

[Guillaume Desmottes]

---
 lib/gibber/gibber-oob-file-transfer.c |    8 ++++----
 lib/gibber/gibber-oob-file-transfer.h |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 80442ff..f9ae557 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -150,15 +150,16 @@ static gchar *
 unescape_filename (const char *escaped);
 
 GibberFileTransfer *
-gibber_oob_file_transfer_new_from_stanza (GibberXmppStanza *stanza,
-                                          GibberXmppConnection *connection)
+gibber_oob_file_transfer_new_from_stanza_with_from (
+    GibberXmppStanza *stanza,
+    GibberXmppConnection *connection,
+    const gchar *peer_id)
 {
   GibberOobFileTransfer *self;
   GibberXmppNode *query;
   GibberXmppNode *url_node;
   GibberXmppNode *desc_node;
   const gchar *self_id;
-  const gchar *peer_id;
   const gchar *type;
   const gchar *id;
   const gchar *size;
@@ -170,7 +171,6 @@ gibber_oob_file_transfer_new_from_stanza (GibberXmppStanza *stanza,
   if (strcmp (stanza->node->name, "iq") != 0)
     return NULL;
 
-  peer_id = gibber_xmpp_node_get_attribute (stanza->node, "from");
   self_id = gibber_xmpp_node_get_attribute (stanza->node, "to");
   if (peer_id == NULL || self_id == NULL)
     return NULL;
diff --git a/lib/gibber/gibber-oob-file-transfer.h b/lib/gibber/gibber-oob-file-transfer.h
index 85f8c93..cec7714 100644
--- a/lib/gibber/gibber-oob-file-transfer.h
+++ b/lib/gibber/gibber-oob-file-transfer.h
@@ -61,9 +61,10 @@ GType gibber_oob_file_transfer_get_type (void);
 
 
 gboolean gibber_oob_file_transfer_is_file_offer (GibberXmppStanza *stanza);
-GibberFileTransfer *gibber_oob_file_transfer_new_from_stanza (
-    GibberXmppStanza *stanza, GibberXmppConnection *connection);
 
+GibberFileTransfer *gibber_oob_file_transfer_new_from_stanza_with_from (
+    GibberXmppStanza *stanza, GibberXmppConnection *connection,
+    const gchar *from);
 
 G_END_DECLS
 
-- 
1.5.6.5