Merge lp:~mzanetti/reminders-app/fix-fetching-notes into lp:reminders-app

[Michael Zanetti]

fix fetching notes content.

[David Planella (dpm)]

That definitely fixes it, thanks!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/59/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1167/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-autolanding/59
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/59

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:56
http://91.189.93.70:8080/job/reminders-app-ci/197/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1172/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/197
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/197

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/197/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

I've talked to balloons about the test failure and he's talked to fginther in turn.

The way they recommend to fix this is to bump the version of the package in debian/changelog to 0.4 (higher than the 0.3 version in the PPA) to avoid the conflict with the 0.3 package in the PPA.

review: Needs Fixing

[lp:~mzanetti/reminders-app/fix-fetching-notes]

57. By Michael Zanetti on 2014-02-07

bump changelog

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

PASSED: Continuous integration, rev:57
http://91.189.93.70:8080/job/reminders-app-ci/199/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1175
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/199

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/199/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-19 13:59:12 +0000
+++ debian/changelog	2014-02-07 18:23:31 +0000
@@ -1,8 +1,9 @@
-reminders-app (0.2ubuntu1) UNRELEASED; urgency=medium
+reminders-app (0.4) trusty; urgency=medium
 
+  [ Sergio Schvezov ]
   * Adding common cmake. 
 
- -- Sergio Schvezov <[e-mail]>  Sun, 19 Jan 2014 10:30:23 -0300
+ -- Michael Zanetti <[e-mail]>  Fri, 07 Feb 2014 19:22:48 +0100
 
 reminders-app (0.2) saucy; urgency=low
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-02-05 20:37:05 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-02-07 18:23:31 +0000
@@ -237,7 +237,7 @@
     }
 
     Note *note = m_notesHash.value(QString::fromStdString(result.guid));
-    if (note) {
+    if (!note) {
         qWarning() << "can't find note for this update... ignoring...";
         return;
     }