Merge lp:~unity-api-team/telephony-service/file-based-infographics into lp:telephony-service

Proposed by Pete Woods on 2014-06-23
Status: Approved
Approved by: Pete Woods on 2014-07-31
Approved revision: 838
Proposed branch: lp:~unity-api-team/telephony-service/file-based-infographics
Merge into: lp:telephony-service
Diff against target: 55 lines (+10/-2)
4 files modified
CMakeLists.txt (+7/-0)
debian/control (+1/-1)
debian/telephony-service.install (+1/-0)
indicator/metrics.cpp (+1/-1)
To merge this branch: bzr merge lp:~unity-api-team/telephony-service/file-based-infographics
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-07-14
Gustavo Pichorim Boiko (community) 2014-06-23 Needs Fixing on 2014-07-04
Review via email: mp+224105@code.launchpad.net

Commit message

Support the new libusermetrics hook

Description of the change

Support the new libusermetrics hook

Depends on lp:~unity-team/libusermetrics/file-based-infographics being merged

To post a comment you must log in.
834. By Pete Woods on 2014-06-23

Work around breakage resulting from Qt5.3

See: https://qt.gitorious.org/qt/digia-qt/commit/e1ac82f713ab2a766ae518f3ec7a7f76689acb48

835. By Pete Woods on 2014-06-25

Set the APP_ID

Gustavo Pichorim Boiko (boiko) wrote :

Can you please remove the workarounds in greeter contacts' tests? Also, can you please merge the latest changes from trunk in this MR?

Thanks.

review: Needs Fixing
836. By Pete Woods on 2014-07-07

Revert the workaround

837. By Pete Woods on 2014-07-07

Merge trunk

838. By Pete Woods on 2014-07-14

Merge trunk

839. By Pete Woods on 2014-08-06

Merge trunk

MichaƂ Sawicz (saviq) wrote :

Text conflict in indicator/metrics.cpp
1 conflicts encountered.

840. By Gustavo Pichorim Boiko on 2014-09-02

Merge latest changes from trunk.

Unmerged revisions

840. By Gustavo Pichorim Boiko on 2014-09-02

Merge latest changes from trunk.

839. By Pete Woods on 2014-08-06

Merge trunk

838. By Pete Woods on 2014-07-14

Merge trunk

837. By Pete Woods on 2014-07-07

Merge trunk

836. By Pete Woods on 2014-07-07

Revert the workaround

835. By Pete Woods on 2014-06-25

Set the APP_ID

834. By Pete Woods on 2014-06-23

Work around breakage resulting from Qt5.3

See: https://qt.gitorious.org/qt/digia-qt/commit/e1ac82f713ab2a766ae518f3ec7a7f76689acb48

833. By Pete Woods on 2014-06-23

Support the new libusermetrics hook

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-08-05 20:04:00 +0000
3+++ CMakeLists.txt 2014-09-02 17:10:50 +0000
4@@ -86,6 +86,13 @@
5 add_definitions(-std=c++11)
6
7 set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
8+
9+# install infographics source hook
10+install(
11+ FILES "${DATA_DIR}/telephony-service.json"
12+ DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
13+ )
14+
15 # install assets
16 set(ASSETS_DIR assets)
17 install(DIRECTORY ${ASSETS_DIR} DESTINATION ${TELEPHONY_SERVICE_DIR})
18
19=== added file 'data/telephony-service.json'
20=== modified file 'debian/control'
21--- debian/control 2014-08-19 15:27:08 +0000
22+++ debian/control 2014-09-02 17:10:50 +0000
23@@ -30,7 +30,7 @@
24 qtdeclarative5-ubuntu-ui-toolkit-plugin,
25 qtmultimedia5-dev (>= 5.0),
26 qtpim5-dev (>= 5),
27- libusermetricsinput1-dev,
28+ libusermetricsinput1-dev (>= 1.2.0),
29 telepathy-mission-control-5,
30 xvfb,
31 Standards-Version: 3.9.4
32
33=== modified file 'debian/telephony-service.install'
34--- debian/telephony-service.install 2014-03-24 18:53:27 +0000
35+++ debian/telephony-service.install 2014-09-02 17:10:50 +0000
36@@ -14,5 +14,6 @@
37 usr/share/polkit-1/actions/*TelephonyService*.policy
38 usr/share/telepathy/clients/TelephonyService*.client
39 usr/share/telephony-service/assets/*
40+usr/share/libusermetrics
41 var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
42 upstart/telephony-service-indicator.conf /usr/share/upstart/sessions
43
44=== modified file 'indicator/metrics.cpp'
45--- indicator/metrics.cpp 2014-08-20 09:35:55 +0000
46+++ indicator/metrics.cpp 2014-09-02 17:10:50 +0000
47@@ -38,7 +38,7 @@
48 QObject(parent)
49 {
50 try {
51- mMetricManager.reset(MetricManager::getInstance());
52+ mMetricManager.reset(MetricManager::getInstance(APP_ID));
53 mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages sent today"))
54 .emptyDataString(GettextMarkExtraction("No text messages sent today")).textDomain(APP_ID).minimum(0.0));
55 mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages received today"))

Subscribers

People subscribed via source and target branches