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
86
add_definitions(-std=c++11)
86
add_definitions(-std=c++11)
6
87
87
7
88
set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
88
set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
8
89
9
90
# install infographics source hook
10
91
install(
11
92
    FILES "${DATA_DIR}/telephony-service.json"
12
93
    DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
13
94
    )
14
95
15
89
# install assets
96
# install assets
16
90
set(ASSETS_DIR assets)
97
set(ASSETS_DIR assets)
17
91
install(DIRECTORY ${ASSETS_DIR} DESTINATION ${TELEPHONY_SERVICE_DIR})
98
install(DIRECTORY ${ASSETS_DIR} DESTINATION ${TELEPHONY_SERVICE_DIR})
18
92
99
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
30
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
30
               qtdeclarative5-ubuntu-ui-toolkit-plugin,
25
31
               qtmultimedia5-dev (>= 5.0),
31
               qtmultimedia5-dev (>= 5.0),
26
32
               qtpim5-dev (>= 5),
32
               qtpim5-dev (>= 5),
28
33
               libusermetricsinput1-dev,
33
               libusermetricsinput1-dev (>= 1.2.0),
29
34
               telepathy-mission-control-5,
34
               telepathy-mission-control-5,
30
35
               xvfb,
35
               xvfb,
31
36
Standards-Version: 3.9.4
36
Standards-Version: 3.9.4
32
37
37
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
14
usr/share/polkit-1/actions/*TelephonyService*.policy
14
usr/share/polkit-1/actions/*TelephonyService*.policy
38
15
usr/share/telepathy/clients/TelephonyService*.client
15
usr/share/telepathy/clients/TelephonyService*.client
39
16
usr/share/telephony-service/assets/*
16
usr/share/telephony-service/assets/*
40
17
usr/share/libusermetrics
41
17
var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
18
var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
42
18
upstart/telephony-service-indicator.conf /usr/share/upstart/sessions
19
upstart/telephony-service-indicator.conf /usr/share/upstart/sessions
43
19
20
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
38
    QObject(parent)
38
    QObject(parent)
49
39
{
39
{
50
40
    try {
40
    try {
52
41
        mMetricManager.reset(MetricManager::getInstance());
41
        mMetricManager.reset(MetricManager::getInstance(APP_ID));
53
42
        mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages sent today"))
42
        mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages sent today"))
54
43
                                                      .emptyDataString(GettextMarkExtraction("No text messages sent today")).textDomain(APP_ID).minimum(0.0));
43
                                                      .emptyDataString(GettextMarkExtraction("No text messages sent today")).textDomain(APP_ID).minimum(0.0));
55
44
        mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages received today"))
44
        mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages received today"))
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
Related bugs:	Link a bug report
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