ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/background-revert-new-content-hub into lp:ubuntu-system-settings

  1. background-revert-new-content-hub
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 391
Merged at revision: 391
Proposed branch: lp:~seb128/ubuntu-system-settings/background-revert-new-content-hub
Merge into: lp:ubuntu-system-settings
Diff against target: 46 lines (+6/-23)
1 file modified
plugins/background/MainPage.qml (+6/-23)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/background-revert-new-content-hub
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak Approve
Review via email: mp+187807@code.launchpad.net

Commit message

background: revert use of the new content-hub, it's buggy (see bug #1231368)

Description of the change

background: revert use of the new content-hub, it's buggy

To post a comment you must log in.
lp:~seb128/ubuntu-system-settings/background-revert-new-content-hub updated
391. By Sebastien Bacher

background: revert use of the new content-hub, it's buggy (see bug #1231368)

Revision history for this message
Sebastien Bacher (seb128) wrote :

that's reverting r372

Revision history for this message
Łukasz Zemczak (sil2100) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/background/MainPage.qml'
2--- plugins/background/MainPage.qml 2013-09-23 19:45:35 +0000
3+++ plugins/background/MainPage.qml 2013-09-26 14:53:02 +0000
4@@ -77,18 +77,9 @@
5 }
6
7 onClicked: {
8- var transfer = ContentHub.importContent(ContentType.Pictures,
9- ContentHub.defaultSourceForType(ContentType.Pictures));
10- if (transfer != null)
11- {
12- transfer.selectionType = ContentTransfer.Single;
13- var store = ContentHub.defaultStoreForType(ContentType.Pictures);
14- console.log("Store is: " + store.uri);
15- transfer.setStore(store);
16- activeTransfer = transfer;
17- activeTransfer.start();
18- }
19-
20+ activeTransfer = ContentHub.importContent(ContentType.Pictures,
21+ ContentHub.defaultSourceForType(ContentType.Pictures));
22+ activeTransfer.start();
23 }
24
25 Component.onCompleted: updateImage(testWelcomeImage,
26@@ -112,17 +103,9 @@
27 homeImage)
28
29 onClicked: {
30- var transfer = ContentHub.importContent(ContentType.Pictures,
31- ContentHub.defaultSourceForType(ContentType.Pictures));
32- if (transfer != null)
33- {
34- transfer.selectionType = ContentTransfer.Single;
35- var store = ContentHub.defaultStoreForType(ContentType.Pictures);
36- console.log("Store is: " + store.uri);
37- transfer.setStore(store);
38- activeTransfer = transfer;
39- activeTransfer.start();
40- }
41+ activeTransfer = ContentHub.importContent(ContentType.Pictures,
42+ ContentHub.defaultSourceForType(ContentType.Pictures));
43+ activeTransfer.start();
44 }
45
46 OverlayImage {

Subscribers

People subscribed via source and target branches