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

[Ken VanDine]

Added Type::Known::contacts. Note: there is no associated default
store for contacts under any scope. Data for contacts doesn't persist.

Added Type::Known::contacts. Note: there is no associated default
store for contacts under any scope. Data for contacts doesn't persist.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

works fine.

review: Approve

=== modified file 'import/Ubuntu/Content/contenttype.cpp'
--- import/Ubuntu/Content/contenttype.cpp	2013-10-21 16:36:02 +0000
+++ import/Ubuntu/Content/contenttype.cpp	2013-12-10 16:01:22 +0000
@@ -42,6 +42,9 @@
    \row
      \li ContentType.Music
      \li Music
+   \row
+     \li ContentType.Contacts
+     \li Music
    \endtable
  */
 
@@ -78,6 +81,7 @@
     case Documents: return cuc::Type::Known::documents();
     case Pictures: return cuc::Type::Known::pictures();
     case Music: return cuc::Type::Known::music();
+    case Contacts: return cuc::Type::Known::contacts();
     default: return cuc::Type::unknown();
     }
 }

=== modified file 'import/Ubuntu/Content/contenttype.h'
--- import/Ubuntu/Content/contenttype.h	2013-10-21 17:16:57 +0000
+++ import/Ubuntu/Content/contenttype.h	2013-12-10 16:01:22 +0000
@@ -32,7 +32,8 @@
         Unknown = 0,
         Documents = 1,
         Pictures = 2,
-        Music = 3
+        Music = 3,
+        Contacts = 4
     };
 
     ContentType(QObject *parent = nullptr);

=== modified file 'include/com/ubuntu/content/type.h'
--- include/com/ubuntu/content/type.h	2013-07-16 11:04:48 +0000
+++ include/com/ubuntu/content/type.h	2013-12-10 16:01:22 +0000
@@ -44,6 +44,7 @@
         static const Type& documents();
         static const Type& pictures();
         static const Type& music();
+        static const Type& contacts();
     };
 
     virtual ~Type();

=== 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-09-10 19:51:00 +0000
+++ src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml	2013-12-10 16:01:22 +0000
@@ -10,6 +10,9 @@
     <key name="documents" type="s">
       <default>"notes-app"</default>
     </key>
+    <key name="contacts" type="s">
+      <default>"address-book-app"</default>
+    </key>
   </schema>
   <schema id="com.ubuntu.content.hub.all" path="/com/ubuntu/content/hub/peers/">
     <key name="pictures" type="as">
@@ -21,5 +24,8 @@
     <key name="documents" type="as">
       <default>[]</default>
     </key>
+    <key name="contacts" type="as">
+      <default>[]</default>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2013-09-25 03:14:53 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2013-12-10 16:01:22 +0000
@@ -128,6 +128,11 @@
             if (not registry->install_peer_for_type(cuc::Type::Known::documents(), peer))
                 qWarning() << "Failed to install peer for" << source;
         }
+        else if (source == "contacts")
+        {
+            if (not registry->install_peer_for_type(cuc::Type::Known::contacts(), peer))
+                qWarning() << "Failed to install peer for" << source;
+        }
     }
     return true;
 }

=== modified file 'src/com/ubuntu/content/type.cpp'
--- src/com/ubuntu/content/type.cpp	2013-07-15 11:07:50 +0000
+++ src/com/ubuntu/content/type.cpp	2013-12-10 16:01:22 +0000
@@ -86,3 +86,9 @@
     static cuc::Type t("music", nullptr);
     return t;
 }
+
+const cuc::Type& cuc::Type::Known::contacts()
+{
+    static cuc::Type t("contacts", nullptr);
+    return t;
+}