gallery-app

Merge lp:~schwann/gallery-app/gallery-conent-url into lp:gallery-app

  1. gallery-conent-url
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Ken VanDine
Approved revision: 831
Merged at revision: 833
Proposed branch: lp:~schwann/gallery-app/gallery-conent-url
Merge into: lp:gallery-app
Diff against target: 12 lines (+1/-2)
1 file modified
src/gallery-manager.cpp (+1/-2)
To merge this branch: bzr merge lp:~schwann/gallery-app/gallery-conent-url
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomas Moenicke (community) Approve
Review via email: mp+182861@code.launchpad.net

Commit message

Return urls not filenames to content hub

Description of the change

Return urls not filenames to content hub

To post a comment you must log in.
Revision history for this message
Thomas Moenicke (thomas-moenicke) wrote :

good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/455/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2783
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2789
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2789/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/389/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/357

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/455/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/105
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2791
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/391
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/391/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/359

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/456/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/266
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2790
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2796
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2796/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/395
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/395/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/363

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/456/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

The image is broken https://bugs.launchpad.net/touch-preview-images/+bug/1218237

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/267
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2820
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2826
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2826/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/379
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/386

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/457/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:830
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/268
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/425
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/390

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/458/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/106
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2839
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2839/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/429
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/386
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/393

review: Needs Fixing (continuous-integration)
lp:~schwann/gallery-app/gallery-conent-url updated
831. By Günter Schwann

Trunk merged

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:831
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/288
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/288/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2945
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2945/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/508
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/508/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/462

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/478/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gallery-manager.cpp'
2--- src/gallery-manager.cpp 2013-08-28 19:23:37 +0000
3+++ src/gallery-manager.cpp 2013-09-03 14:44:57 +0000
4@@ -136,8 +136,7 @@
5 QVector<QUrl> selectedMedias;
6 selectedMedias.reserve(sources.size());
7 foreach (const MediaSource *media, sources) {
8- QUrl url(media->path().toLocalFile());
9- selectedMedias.append(url);
10+ selectedMedias.append(media->path());
11 }
12 m_contentCommunicator->returnPhotos(selectedMedias);
13

Subscribers

People subscribed via source and target branches