Merge lp:~vthompson/ubuntu-weather-app/reboot-fix-duplicate-location-popup into lp:ubuntu-weather-app

[Victor Thompson]

Fix broken popup component

Fix broken popup component. Without this popup, the user gets no feedback as to whether the location was added.

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/129/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/129

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/129/rebuild

review: Approve (continuous-integration)

=== modified file 'app/ui/AddLocationPage.qml'
--- app/ui/AddLocationPage.qml	2015-06-21 20:14:39 +0000
+++ app/ui/AddLocationPage.qml	2015-06-28 23:38:34 +0000
@@ -234,7 +234,7 @@
                 if (storage.addLocation(citiesModel.get(index))) {
                     mainPageStack.pop()
                 } else {
-                    PopupUtils.open(locationExistsComponent, addPage)
+                    PopupUtils.open(locationExistsComponent, addLocationPage)
                 }
             }
         }