From 8edb4549660ac26cdd4c4dfe44c6c3b0c7b642a2 Mon Sep 17 00:00:00 2001
From: Theoziran Lima <theoziran.silva@basis.com.br>
Date: Tue, 14 Apr 2015 17:23:32 -0300
Subject: [PATCH 1/3] Fixing when the path has space, it closes #368

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index fa472be3e..fb57e67ce 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -122,7 +122,7 @@ module.exports = function(grunt) {
                 done();
         };
         var rjsext = (process.platform === 'win32') ? '.cmd' : '';
-        var rjs = path.resolve('./node_modules/.bin/r.js' + rjsext);
+        var rjs = '"' + path.resolve('./node_modules/.bin/r.js' + rjsext) + '"';
         exec(rjs + ' -o src/build.js && ' +
              rjs + ' -o src/build.js optimize=none out=builds/converse.js && ' +
              rjs + ' -o src/build-no-jquery.js &&' +

From 1b6e67ae73830b164d47eb0dd101eab065b641da Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 15 Apr 2015 21:19:43 +0200
Subject: [PATCH 2/3] Don't call updateVCard if use_vcards is false.

---
 converse.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/converse.js b/converse.js
index e7d04ef51..1cebb8291 100644
--- a/converse.js
+++ b/converse.js
@@ -1507,6 +1507,7 @@
             },
 
             updateVCard: function () {
+                if (!this.use_vcards) { return; }
                 var jid = this.model.get('jid'),
                     contact = converse.roster.get(jid);
                 if ((contact) && (!contact.get('vcard_updated'))) {

From 50f4d6b582537e690342d9c0275e070d0c31288e Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 15 Apr 2015 21:52:00 +0200
Subject: [PATCH 3/3] Use unminified strophe

---
 non_amd.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/non_amd.html b/non_amd.html
index 64800bfaa..b63d669e8 100644
--- a/non_amd.html
+++ b/non_amd.html
@@ -31,7 +31,7 @@
     <!-- until here -->
     <script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script>
     <script type="text/javascript" src="src/otr.js"></script>
-    <script type="text/javascript" src="components/strophe/strophe.min.js"></script>
+    <script type="text/javascript" src="components/strophejs/strophe.js"></script>
     <script type="text/javascript" src="src/strophe.roster.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>