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

[Sebastien Bacher]

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

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

[lp:~seb128/ubuntu-system-settings/background-revert-new-content-hub]

391. By Sebastien Bacher on 2013-09-26

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

[Sebastien Bacher (seb128)]

that's reverting r372

[Łukasz Zemczak (sil2100)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/background/MainPage.qml'
--- plugins/background/MainPage.qml	2013-09-23 19:45:35 +0000
+++ plugins/background/MainPage.qml	2013-09-26 14:53:02 +0000
@@ -77,18 +77,9 @@
          }
 
         onClicked: {
-            var transfer = ContentHub.importContent(ContentType.Pictures,
-                                                    ContentHub.defaultSourceForType(ContentType.Pictures));
-            if (transfer != null)
-            {
-                transfer.selectionType = ContentTransfer.Single;
-                var store = ContentHub.defaultStoreForType(ContentType.Pictures);
-                console.log("Store is: " + store.uri);
-                transfer.setStore(store);
-                activeTransfer = transfer;
-                activeTransfer.start();
-            }
-
+            activeTransfer = ContentHub.importContent(ContentType.Pictures,
+                                                      ContentHub.defaultSourceForType(ContentType.Pictures));
+            activeTransfer.start();
         }
 
         Component.onCompleted: updateImage(testWelcomeImage,
@@ -112,17 +103,9 @@
                                            homeImage)
 
         onClicked: {
-            var transfer = ContentHub.importContent(ContentType.Pictures,
-                                                    ContentHub.defaultSourceForType(ContentType.Pictures));
-            if (transfer != null)
-            {
-                transfer.selectionType = ContentTransfer.Single;
-                var store = ContentHub.defaultStoreForType(ContentType.Pictures);
-                console.log("Store is: " + store.uri);
-                transfer.setStore(store);
-                activeTransfer = transfer;
-                activeTransfer.start();
-            }
+            activeTransfer = ContentHub.importContent(ContentType.Pictures,
+                                                      ContentHub.defaultSourceForType(ContentType.Pictures));
+            activeTransfer.start();
         }
 
         OverlayImage {