Merge branch 'gsoc_0' of https://github.com/hrxi/dino into hrxi-gsoc_0

1 files changed, 4 insertions, 1 deletions

diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index 6f8ccee4..7665936c 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -66,6 +66,7 @@ public class FileManager : StreamInteractionModule, Object {
         foreach (FileSender file_sender in file_senders) {
             if (file_sender.can_send(conversation, file_transfer)) {
                 file_sender.send_file(conversation, file_transfer);
+                break;
             }
         }
         received_file(file_transfer, conversation);
@@ -120,7 +121,9 @@ public class FileManager : StreamInteractionModule, Object {
     }
 
     public void add_sender(FileSender file_sender) {
-        file_senders.add(file_sender);
+        // Order file_senders in reverse order of adding them -- HTTP is added
+        // later than Jingle.
+        file_senders.insert(0, file_sender);
         file_sender.upload_available.connect((account) => {
             upload_available(account);
         });