Merge lp:~abreu-alexandre/unity-webapps-qml/content-hub-fail-safe-14-10 into lp:unity-webapps-qml/14.10

[Alexandre Abreu]

Dont expect the content hub to be installed in a desktop environment.

Dont expect the content hub to be installed in a desktop environment.

[David Barth (dbarth)]

review: Approve

Unmerged revisions

134. By Alexandre Abreu on 2014-12-03

backport content hub failsafe init fix

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-07-18 21:46:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-12-03 18:52:06 +0000
@@ -775,7 +775,8 @@
                 return AlarmApiBackend.createAlarmApi(UnityBackends.backendDelegate)
             }),
 
-            ContentHub: ContentHubApiBackend.createContentHubApi(UnityBackends.backendDelegate),
+            ContentHub: ContentHubApiBackend.createContentHubApi(
+                            UnityBackends.backendDelegate, webapps),
 
             RuntimeApi:  __injectResourceIfExtraApisAreEnabled(function() {
                 return RuntimeApiBackend.createRuntimeApi(UnityBackends.backendDelegate)

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-06-17 13:53:49 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-12-03 18:52:06 +0000
@@ -16,15 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-.import Ubuntu.Content 0.1 as ContentHubBridge
-
 /**
  *
  * ContentHub API backend binding
  *
  */
 
-function createContentHubApi(backendDelegate, accessPolicy) {
+function createContentHubApi(backendDelegate, parent) {
+
+    var bridge = null
+    try {
+        bridge = Qt.createQmlObject(
+            'import QtQuick 2.0; import Ubuntu.Content 0.1 as ContentHubBridge; \
+            QtObject { property var hub: ContentHubBridge }', parent)
+    }
+    catch(e) { }
+
+    if (!bridge) {
+        console.log('Could not create ContentHub backend (does not appear to be installed)')
+        return {};
+    }
+
+    var ContentHubBridge = bridge.hub;
+
     var PLUGIN_URI = 'Ubuntu.Content';
     var VERSION = 0.1;