Merge lp:~renatofilho/qtorganizer5-eds/fix-1285056 into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Fixed memory leaks of ECalComponentDateTime object.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? YES
lp:~renatofilho/qtorganizer5-eds/qt5.0.2

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): YES

Did you perform an exploratory manual test run of your 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/qtorganizer5-eds) on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE

[lp:~renatofilho/qtorganizer5-eds/fix-1285056]

37. By Renato Araujo Oliveira Filho on 2014-02-26

Fixed memory leak caused by object returned by e_cal_component_get_rrule_list.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator? YES (https://wiki.ubuntu.com/Process/Merges/TestPlan/qtorganizer5-eds) with a special view to recurrent events/alarms

Did CI run pass? 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-engine.cpp'
--- qorganizer/qorganizer-eds-engine.cpp	2014-02-20 19:22:50 +0000
+++ qorganizer/qorganizer-eds-engine.cpp	2014-02-26 14:58:59 +0000
@@ -1167,8 +1167,9 @@
             irec.setRecurrenceRules(qRules);
             item->saveDetail(&irec);
         }
+
+        e_cal_component_free_recur_list(ruleList);
     }
-    // TODO: free ruleList;
     // TODO: exeptions rules
 }
 
@@ -1552,11 +1553,11 @@
 {
     QOrganizerEventTime etr = item.detail(QOrganizerItemDetail::TypeEventTime);
     if (!etr.isEmpty()) {
-        ECalComponentDateTime *dt = g_new0(ECalComponentDateTime, 1);
-        dt->value = g_new0(struct icaltimetype, 1);
-        *dt->value = icaltime_from_timet(etr.startDateTime().toTime_t(), etr.isAllDay());
-        e_cal_component_set_dtstart(comp, dt);
-        e_cal_component_free_datetime(dt);
+        struct icaltimetype ict = icaltime_from_timet(etr.startDateTime().toTime_t(), etr.isAllDay());
+        ECalComponentDateTime dt;
+        dt.tzid = NULL;
+        dt.value = &ict;
+        e_cal_component_set_dtstart(comp, &dt);
     }
 }
 
@@ -1564,11 +1565,11 @@
 {
     QOrganizerEventTime etr = item.detail(QOrganizerItemDetail::TypeEventTime);
     if (!etr.isEmpty()) {
-        ECalComponentDateTime *dt = g_new0(ECalComponentDateTime, 1);
-        dt->value = g_new0(struct icaltimetype, 1);
-        *dt->value = icaltime_from_timet(etr.endDateTime().toTime_t(), etr.isAllDay());
-        e_cal_component_set_dtend(comp, dt);
-        e_cal_component_free_datetime(dt);
+        struct icaltimetype ict = icaltime_from_timet(etr.endDateTime().toTime_t(), etr.isAllDay());
+        ECalComponentDateTime dt;
+        dt.tzid = NULL;
+        dt.value = &ict;
+        e_cal_component_set_dtend(comp, &dt);
     }
 }
 
@@ -1576,11 +1577,11 @@
 {
     QOrganizerTodoTime etr = item.detail(QOrganizerItemDetail::TypeTodoTime);
     if (!etr.isEmpty()) {
-        ECalComponentDateTime *dt = g_new0(ECalComponentDateTime, 1);
-        dt->value = g_new0(struct icaltimetype, 1);
-        *dt->value = icaltime_from_timet(etr.startDateTime().toTime_t(), etr.isAllDay());
-        e_cal_component_set_dtstart(comp, dt);
-        e_cal_component_free_datetime(dt);
+        struct icaltimetype ict = icaltime_from_timet(etr.startDateTime().toTime_t(), etr.isAllDay());
+        ECalComponentDateTime dt;
+        dt.tzid = NULL;
+        dt.value = &ict;
+        e_cal_component_set_dtstart(comp, &dt);;
     }
 }
 
@@ -1723,7 +1724,7 @@
             ruleList = g_slist_append(ruleList, rule);
         }
         e_cal_component_set_rrule_list(comp, ruleList);
-        //TODO: free ruleList
+        g_slist_free_full(ruleList, g_free);
     }
 }
 
@@ -1748,13 +1749,11 @@
 {
     QOrganizerTodoTime ttr = item.detail(QOrganizerItemDetail::TypeTodoTime);
     if (!ttr.isEmpty()) {
-        ECalComponentDateTime *due = g_new0(ECalComponentDateTime, 1);
-        due->value = g_new0(struct icaltimetype, 1);
-
-        struct icaltimetype itt = icaltime_from_timet(ttr.dueDateTime().toTime_t(), ttr.isAllDay());
-        *due->value = itt;
-        e_cal_component_set_due(comp, due);
-        e_cal_component_free_datetime(due);
+        struct icaltimetype ict = icaltime_from_timet(ttr.dueDateTime().toTime_t(), ttr.isAllDay());
+        ECalComponentDateTime dt;
+        dt.tzid = NULL;
+        dt.value = &ict;
+        e_cal_component_set_due(comp, &dt);;
     }
 }
 
@@ -1927,10 +1926,11 @@
 
     QOrganizerJournalTime jtime = item.detail(QOrganizerItemDetail::TypeJournalTime);
     if (!jtime.isEmpty()) {
-        ECalComponentDateTime *dt = g_new0(ECalComponentDateTime, 1);
-        *dt->value = icaltime_from_timet(jtime.entryDateTime().toTime_t(), FALSE);
-        e_cal_component_set_dtstart(comp, dt);
-        e_cal_component_free_datetime(dt);
+        struct icaltimetype ict = icaltime_from_timet(jtime.entryDateTime().toTime_t(), FALSE);
+        ECalComponentDateTime dt;
+        dt.tzid = NULL;
+        dt.value = &ict;
+        e_cal_component_set_dtstart(comp, &dt);
     }
 
     return comp;