Merge lp:~renatofilho/ubuntu/trusty/syncevolution/fix-1306112 into lp:ubuntu/trusty/syncevolution

[Renato Araujo Oliveira Filho]

Added patch to optimize EDS calendar sync.

[lp:~renatofilho/ubuntu/trusty/syncevolution/fix-1306112]

24. By Renato Araujo Oliveira Filho on 2014-04-15

Added patches to optimized calendar sync.

[Martin Pitt (pitti)]

syncevolution was already uploaded: https://launchpad.net/ubuntu/+source/syncevolution/1.4-1ubuntu4 Closing MP.

review: Approve

=== added file 'debian/patches/0001-Removed-WORKAROUND-used-by-old-EDS-API.patch'
--- debian/patches/0001-Removed-WORKAROUND-used-by-old-EDS-API.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Removed-WORKAROUND-used-by-old-EDS-API.patch	2014-04-15 17:00:47 +0000
@@ -0,0 +1,59 @@
+From b252db30416e15949aa4736c30991bf69d060506 Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Tue, 15 Apr 2014 13:51:32 -0300
+Subject: [PATCH 1/3] Removed WORKAROUND used by old EDS API.
+
+Does not remove children events before add the main event when using E_CLIENT API.
+---
+ src/backends/evolution/EvolutionCalendarSource.cpp | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp
+index 7cddbca..cac00c3 100644
+--- a/src/backends/evolution/EvolutionCalendarSource.cpp
++++ b/src/backends/evolution/EvolutionCalendarSource.cpp
+@@ -619,11 +619,12 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
+                 // adding the parent, then updating it with the
+                 // saved children.
+                 //
+-                // TODO: still necessary with e_cal_client API?
++#ifndef USE_EDS_CLIENT
+                 ICalComps_t children;
+                 if (id.m_rid.empty()) {
+                     children = removeEvents(id.m_uid, true);
+                 }
++#endif
+ 
+                 // creating new objects works for normal events and detached occurrences alike
+                 if (
+@@ -648,23 +649,17 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
+                     throwError("storing new item", gerror);
+                 }
+ 
++#ifndef USE_EDS_CLIENT
+                 // Recreate any children removed earlier: when we get here,
+                 // the parent exists and we must update it.
+                 BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
+-                    if (
+-#ifdef USE_EDS_CLIENT
+-                        !e_cal_client_modify_object_sync(m_calendar, *icalcomp,
+-                                                         CALOBJ_MOD_THIS, NULL,
+-                                                         gerror)
+-#else
+-                        !e_cal_modify_object(m_calendar, *icalcomp,
++                    if (!e_cal_modify_object(m_calendar, *icalcomp,
+                                              CALOBJ_MOD_THIS,
+-                                             gerror)
+-#endif
+-                        ) {
++                                             gerror)) {
+                         throwError(string("recreating item ") + newluid, gerror);
+                     }
+                 }
++#endif
+             }
+         }
+     }
+-- 
+1.9.1
+

=== added file 'debian/patches/0002-Avoid-register-unecessary-timezones.patch'
--- debian/patches/0002-Avoid-register-unecessary-timezones.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-Avoid-register-unecessary-timezones.patch	2014-04-15 17:00:47 +0000
@@ -0,0 +1,66 @@
+From c7d7466d44de7129fb5c1c67d4ec9274ae11fb1f Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Tue, 15 Apr 2014 13:53:58 -0300
+Subject: [PATCH 2/3] Avoid register unecessary timezones.
+
+---
+ src/backends/evolution/EvolutionCalendarSource.cpp | 13 ++++++++++++-
+ src/backends/evolution/EvolutionCalendarSource.h   |  1 +
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp
+index cac00c3..b7200e1 100644
+--- a/src/backends/evolution/EvolutionCalendarSource.cpp
++++ b/src/backends/evolution/EvolutionCalendarSource.cpp
+@@ -430,6 +430,7 @@ void EvolutionCalendarSource::listAllItems(RevisionMap_t &revisions)
+ 
+ void EvolutionCalendarSource::close()
+ {
++    m_knownTimezones.clear();
+     m_calendar.reset();
+ }
+ 
+@@ -543,10 +544,18 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
+ 
+         GErrorCXX gerror;
+         const char *tzid = icaltimezone_get_tzid(zone);
++
++        //we are receiving two similar timezones names we will remove the prefix to make easy to compare
++        string timeZoneName(tzid);
++        std::size_t found = timeZoneName.find("/freeassociation.sourceforge.net/Tzfile/");
++        if (found != std::string::npos) {
++            timeZoneName.replace(timeZoneName.begin(), timeZoneName.begin() + 40, ""); // 40 == strlen("/freeassociation.sourceforge.net/Tzfile/")
++        }
++
+         if (!tzid || !tzid[0]) {
+             // cannot add a VTIMEZONE without TZID
+             SE_LOG_DEBUG(getDisplayName(), "skipping VTIMEZONE without TZID");
+-        } else {
++        } else if (find(m_knownTimezones.begin(), m_knownTimezones.end(), timeZoneName) == m_knownTimezones.end()) {
+             gboolean success =
+ #ifdef USE_EDS_CLIENT
+                 e_cal_client_add_timezone_sync(m_calendar, zone, NULL, gerror)
+@@ -557,6 +566,8 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
+             if (!success) {
+                 throwError(string("error adding VTIMEZONE ") + tzid,
+                            gerror);
++            } else {
++                m_knownTimezones.push_back(timeZoneName);
+             }
+         }
+     }
+diff --git a/src/backends/evolution/EvolutionCalendarSource.h b/src/backends/evolution/EvolutionCalendarSource.h
+index 6fcfdf5..e197eb9 100644
+--- a/src/backends/evolution/EvolutionCalendarSource.h
++++ b/src/backends/evolution/EvolutionCalendarSource.h
+@@ -164,6 +164,7 @@ class EvolutionCalendarSource : public EvolutionSyncSource,
+ #endif
+     string m_typeName;             /**< "calendar", "task list", "memo list" */
+     EvolutionCalendarSourceType m_type;         /**< use events, tasks or memos? */
++    list<string> m_knownTimezones;  /** list with all timezones already registered on EDS */
+ 
+     // Convenience function for source type casting
+ #ifdef USE_EDS_CLIENT
+-- 
+1.9.1
+

=== added file 'debian/patches/0003-Modify-all-children-using-the-same-function-call.patch'
--- debian/patches/0003-Modify-all-children-using-the-same-function-call.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-Modify-all-children-using-the-same-function-call.patch	2014-04-15 17:00:47 +0000
@@ -0,0 +1,53 @@
+From 5dda5ff313150d15edd900094624f504d70baef8 Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Tue, 15 Apr 2014 13:56:08 -0300
+Subject: [PATCH 3/3] Modify all children using the same function call.
+
+Avoid call individual functions for each child event.
+---
+ src/backends/evolution/EvolutionCalendarSource.cpp | 23 +++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp
+index b7200e1..1e909e1 100644
+--- a/src/backends/evolution/EvolutionCalendarSource.cpp
++++ b/src/backends/evolution/EvolutionCalendarSource.cpp
+@@ -748,21 +748,26 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
+ 
+                 // Recreate any children removed earlier: when we get here,
+                 // the parent exists and we must update it.
+-                BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
+-                    if (
+ #ifdef USE_EDS_CLIENT
+-                        !e_cal_client_modify_object_sync(m_calendar, *icalcomp,
+-                                                         CALOBJ_MOD_THIS, NULL,
+-                                                         gerror)
++                GSList *objs = 0;
++                BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
++                    objs = g_slist_append(objs, *icalcomp);
++                }
++                if (!e_cal_client_modify_objects_sync(m_calendar, objs,
++                                                      CALOBJ_MOD_THIS, NULL,
++                                                      gerror)) {
++                    throwError(string("recreating item ") + luid, gerror);
++                }
++                g_slist_free(objs);
+ #else
+-                        !e_cal_modify_object(m_calendar, *icalcomp,
++                BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
++                    if (!e_cal_modify_object(m_calendar, *icalcomp,
+                                              CALOBJ_MOD_THIS,
+-                                             gerror)
+-#endif
+-                        ) {
++                                             gerror)) {
+                         throwError(string("recreating item ") + luid, gerror);
+                     }
+                 }
++#endif
+             } else {
+                 // no children, updating is simple
+                 if (
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-04 18:24:20 +0000
+++ debian/patches/series	2014-04-15 17:00:47 +0000
@@ -2,3 +2,6 @@
 0001-Include-missing-stdint.h.patch
 0001-autotools-Add-QtCore-include-path-to-KDEPIM_CFLAGS.patch
 fix-photo-merging.patch
+0001-Removed-WORKAROUND-used-by-old-EDS-API.patch
+0002-Avoid-register-unecessary-timezones.patch
+0003-Modify-all-children-using-the-same-function-call.patch