Merge lp:~ken-vandine/content-hub/defaults_triplet into lp:content-hub

[Ken VanDine]

Changed defaults to a triplet used to build the appid. Bumped build depends
for libupstart-app-launch2-dev needed for converting the triplet to an appid.

Changed defaults to a triplet used to build the appid. Bumped build depends
for libupstart-app-launch2-dev needed for converting the triplet to an appid.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/content-hub-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/104/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, approved. In CI Train

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-12-06 12:33:14 +0000
+++ debian/control	2014-01-29 20:42:57 +0000
@@ -11,7 +11,7 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libnih-dbus-dev,
-               libupstart-app-launch2-dev,
+               libupstart-app-launch2-dev (>= 0.3+14.04.20140124),
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,

=== modified file 'src/com/ubuntu/content/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2013-09-20 20:43:51 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2014-01-29 20:42:57 +0000
@@ -24,6 +24,7 @@
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content
   ${GSETTINGS_INCLUDE_DIRS}
+  ${UPSTART_LAUNCH_INCLUDE_DIRS}
 )
 
 add_executable(
@@ -41,6 +42,7 @@
  
   content-hub
   ${GSETTINGS_LDFLAGS}
+  ${UPSTART_LAUNCH_LDFLAGS}
 )
 
 install(
@@ -74,6 +76,7 @@
  
   content-hub
   ${GSETTINGS_LDFLAGS}
+  ${UPSTART_LAUNCH_LDFLAGS}
 )
 
 install(

=== modified file 'src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml'
--- src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2013-12-10 15:59:15 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2014-01-29 20:42:57 +0000
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
   <schema id="com.ubuntu.content.hub.default" path="/com/ubuntu/content/hub/peers/">
-    <key name="pictures" type="s">
-      <default>"gallery-app"</default>
-    </key>
-    <key name="music" type="s">
-      <default>"music-app"</default>
-    </key>
-    <key name="documents" type="s">
-      <default>"notes-app"</default>
-    </key>
-    <key name="contacts" type="s">
-      <default>"address-book-app"</default>
+    <key name="pictures" type="as">
+      <default>["com.ubuntu.gallery", "gallery", "current-user-version"]</default>
+    </key>
+    <key name="music" type="as">
+      <default>[]</default>
+    </key>
+    <key name="documents" type="as">
+      <default>[]</default>
+    </key>
+    <key name="contacts" type="as">
+      <default>[]</default>
     </key>
   </schema>
   <schema id="com.ubuntu.content.hub.all" path="/com/ubuntu/content/hub/peers/">

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2013-09-20 19:54:51 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2014-01-29 20:42:57 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "registry.h"
+#include <upstart-app-launch.h>
 
 Registry::Registry() :
     m_defaultPeers(new QGSettings("com.ubuntu.content.hub.default",
@@ -32,7 +33,13 @@
 {
     qDebug() << Q_FUNC_INFO << type.id();
     if (m_defaultPeers->keys().contains(type.id()))
-        return cuc::Peer(m_defaultPeers->get(type.id()).toString());
+    {
+        QStringList as(m_defaultPeers->get(type.id()).toStringList());
+        std::string pkg = as[0].toStdString();
+        std::string app = as[1].toStdString();
+        std::string ver = as[2].toStdString();
+        return cuc::Peer(QString::fromLocal8Bit(upstart_app_launch_triplet_to_app_id(pkg.c_str(), app.c_str(), ver.c_str())));
+    }
     else
         return cuc::Peer();
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-08-21 13:13:49 +0000
+++ tests/CMakeLists.txt	2014-01-29 20:42:57 +0000
@@ -24,6 +24,7 @@
 include_directories (
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content
+  ${UPSTART_LAUNCH_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/src
   ${GMOCK_INCLUDE_DIR}
   ${GTEST_INCLUDE_DIR}