1
=== modified file 'src/messaging-app-content.json'
2
--- src/messaging-app-content.json	2016-01-27 19:58:52 +0000
3
+++ src/messaging-app-content.json	2016-07-15 19:28:37 +0000
4
@@ -1,4 +1,11 @@
5
1
{
1
{
6
2
    "destination": [
7
3
        "contacts",
8
4
        "pictures",
9
5
        "links",
10
6
        "text",
11
7
        "videos"
12
8
    ],
13
2
    "share": [
9
    "share": [
14
3
        "contacts",
10
        "contacts",
15
4
        "pictures",
11
        "pictures",
16
5
12
17
=== modified file 'src/qml/messaging-app.qml'
18
--- src/qml/messaging-app.qml	2016-05-04 19:36:27 +0000
19
+++ src/qml/messaging-app.qml	2016-07-15 19:28:37 +0000
20
@@ -135,6 +135,13 @@
21
135
        bottomEdge.commitWithProperties(properties)
135
        bottomEdge.commitWithProperties(properties)
22
136
    }
136
    }
23
137
137
24
138
    function startImport(transfer) {
25
139
        var properties = {}
26
140
        emptyStack()
27
141
        properties["sharedAttachmentsTransfer"] = transfer
28
142
        mainView.showBottomEdgePage(properties)
29
143
    }
30
144
31
138
    Connections {
145
    Connections {
32
139
        target: telepathyHelper
146
        target: telepathyHelper
33
140
        // restore default bindings if any system settings changed
147
        // restore default bindings if any system settings changed
34
@@ -203,12 +210,8 @@
35
203
210
36
204
    Connections {
211
    Connections {
37
205
        target: ContentHub
212
        target: ContentHub
44
206
        onShareRequested: {
213
        onImportRequested: startImport(transfer)
45
207
            var properties = {}
214
        onShareRequested: startImport(transfer)
40
208
            emptyStack()
41
209
            properties["sharedAttachmentsTransfer"] = transfer
42
210
            mainView.showBottomEdgePage(properties)
43
211
        }
46
212
    }
215
    }
47
213
216
48
214
    signal applicationReady
217
    signal applicationReady
Status:	Merged
Approved by:	Bill Filler on 2016-07-19
Approved revision:	575
Merged at revision:	578
Proposed branch:	lp:~renatofilho/messaging-app/register-as-destination
Merge into:	lp:messaging-app
Diff against target:	48 lines (+16/-6) 2 files modified src/messaging-app-content.json (+7/-0) src/qml/messaging-app.qml (+9/-6)
To merge this branch:	bzr merge lp:~renatofilho/messaging-app/register-as-destination
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-07-15
PS Jenkins bot	continuous-integration		Pending
Ubuntu Phablet Team		2016-07-15	Pending
Review via email: mp+300239@code.launchpad.net