Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

1 files changed, 8 insertions, 1 deletions

diff --git a/rockworkd/libpebble/jskit/jskitpebble.cpp b/rockworkd/libpebble/jskit/jskitpebble.cpp
index a300aef..e755d60 100644
--- a/rockworkd/libpebble/jskit/jskitpebble.cpp
+++ b/rockworkd/libpebble/jskit/jskitpebble.cpp
@@ -4,6 +4,7 @@
 
 #include "jskitpebble.h"
 #include "jskitxmlhttprequest.h"
+#include "jskitwebsocket.h"
 
 static const char *token_salt = "0feeb7416d3c4546a19b04bccd8419b1";
 
@@ -315,10 +316,16 @@ void JSKitPebble::openURL(const QUrl &url)
 QJSValue JSKitPebble::createXMLHttpRequest()
 {
     JSKitXMLHttpRequest *xhr = new JSKitXMLHttpRequest(m_mgr->engine());
-    // Should be deleted by JS engine.
     return m_mgr->engine()->newQObject(xhr);
 }
 
+QJSValue JSKitPebble::createWebSocket(const QString &url, const QJSValue &protocols)
+{
+    JSKitWebSocket *ws = new JSKitWebSocket(m_mgr->engine(), url, protocols);
+    return m_mgr->engine()->newQObject(ws);
+}
+
+
 QJSValue JSKitPebble::buildAckEventObject(uint transaction, const QString &message) const
 {
     QJSEngine *engine = m_mgr->engine();