Merge lp:~renatofilho/qtorganizer5-eds/optimize-id-parse into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Optimize eventid parse, and avoid memory leak.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/113

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/126/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'qorganizer/qorganizer-eds-viewwatcher.cpp'
--- qorganizer/qorganizer-eds-viewwatcher.cpp	2014-02-25 17:00:58 +0000
+++ qorganizer/qorganizer-eds-viewwatcher.cpp	2014-04-11 17:51:23 +0000
@@ -138,12 +138,14 @@
 
     for (GSList *l = objects; l; l = l->next) {
         const gchar *uid = 0;
-        ECalComponent *comp;
-
-        icalcomponent *clone = icalcomponent_new_clone(static_cast<icalcomponent*>(l->data));
-        comp = e_cal_component_new_from_icalcomponent(clone);
-
-        e_cal_component_get_uid(comp, &uid);
+        icalcomponent *icalcomp = static_cast<icalcomponent*>(l->data);
+        icalproperty *prop = icalcomponent_get_first_property(icalcomp, ICAL_UID_PROPERTY);
+        if (prop) {
+            uid = icalproperty_get_uid(prop);
+        } else {
+            qWarning() << "Fail to parse component ID";
+        }
+
         QOrganizerEDSEngineId *itemId = new QOrganizerEDSEngineId(m_collectionId,
                                                                   QString::fromUtf8(uid));
         result << QOrganizerItemId(itemId);