Merge lp:~renatofilho/ubuntu/vivid/syncevolution/default-syncInterval into lp:ubuntu/vivid/syncevolution

[Renato Araujo Oliveira Filho]

Added patch for syncInterval default value.

Use 90 days as default value for syncInterval. This value will be used by the phone, setting it as default will avoid changes on old configuration files.

[Sebastien Bacher (seb128)]

Thanks, could you provide some background on why that change is needed/wanted? Could you upstream the change as well?

review: Needs Information

[Renato Araujo Oliveira Filho (renatofilho)]

> Thanks, could you provide some background on why that change is needed/wanted?
Added more context on commit message.

> Could you upstream the change as well?
No this will not get upstream this default value is specific for ubuntu devices.

[Sebastien Bacher (seb128)]

Does that value makes sense on desktop as well?

[Iain Lane (laney)]

Is it appropriate to override the upstream default for all Ubuntu users like this?

I'd think that, if you want this for touch, the code interacting with syncevolution there should set the value appropriately.

review: Needs Information

[Dimitri John Ledkov (xnox)]

This does not appear to be reviewed nor approved yet. Something looks buggy, as this has landed in the archive already somehow. Reverting for now, awaiting review and sponsorship by authorised developers to make uploads for this package.

https://launchpad.net/ubuntu/+source/syncevolution/1.5-0ubuntu3

[Ken VanDine (ken-vandine)]

This patch really just changes a default for a value added by another patch of ours. That other patch has been accepted upstream recently, so at least in Ubuntu, the phone is the only real use case affected. This patch eases the migration on the phone, so worth patching. If we decide not to override upstream's default, we'll need to come up with a way to handle migrating the current settings.

I'm not clear why this default won't be accepted upstream, I'll ask Renato for clarification on that.

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

> This patch really just changes a default for a value added by another patch of
> ours. That other patch has been accepted upstream recently, so at least in
> Ubuntu, the phone is the only real use case affected. This patch eases the
> migration on the phone, so worth patching. If we decide not to override
> upstream's default, we'll need to come up with a way to handle migrating the
> current settings.
>
> I'm not clear why this default won't be accepted upstream, I'll ask Renato for
> clarification on that.

This default value is used only by ubuntu devices the upstream project does not want to limit the number of the days synced in the calendar. They want to keep import all as default behavior.

[Dimitri John Ledkov (xnox)]

The proposed change will affect all Ubuntu installations, including Ubuntu Desktop and all flavours. This change is not limited to ubuntu phone, as proposed. Is this a gsettings property that can be overriden to an appropriate value in the settings overlay for the Ubuntu Phone flavour-only, without affecting all other Ubuntu flavours that use syncevolution?

=== added file 'debian/patches/Use-90-days-as-default-value-for-syncInterval.patch'
--- debian/patches/Use-90-days-as-default-value-for-syncInterval.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Use-90-days-as-default-value-for-syncInterval.patch	2015-01-27 19:51:10 +0000
@@ -0,0 +1,43 @@
+From db7ef82c8d87677b00ed310c8e6c1fb5cd729dd2 Mon Sep 17 00:00:00 2001
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Tue, 27 Jan 2015 16:20:26 -0300
+Subject: [PATCH] Use 90 days as default value for syncInterval.
+
+---
+ src/syncevo/SyncConfig.cpp | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/syncevo/SyncConfig.cpp b/src/syncevo/SyncConfig.cpp
+index 7e7e7b4..7429329 100644
+--- a/src/syncevo/SyncConfig.cpp
++++ b/src/syncevo/SyncConfig.cpp
+@@ -2851,7 +2851,7 @@ static ConfigProperty sourcePropCalendarSyncInterval(Aliases("syncInterval"),
+                                            "Defines the number of days before the current date that should be use as start date for the calendar sync.\n"
+                                            "This can be set do limit the number of events imported from the source calendar.\n"
+                                            "\n"
+-                                           "Leave it empty if you want to import all events.\n");
++                                           "If unset, the limit will be set to 90 days..\n");
+ 
+ static StringConfigProperty sourcePropDatabaseFormat("databaseFormat",
+                                                      "Defines the data format to be used by the backend for its\n"
+@@ -3044,9 +3044,15 @@ SyncSourceNodes::getNode(const ConfigProperty &prop) const
+ 
+ InitStateString SyncSourceConfig::getDatabaseID() const { return sourcePropDatabaseID.getProperty(*getNode(sourcePropDatabaseID)); }
+ void SyncSourceConfig::setDatabaseID(const string &value, bool temporarily) { sourcePropDatabaseID.setProperty(*getNode(sourcePropDatabaseID), value, temporarily); }
+-InitStateString SyncSourceConfig::getSyncInterval() const { return sourcePropCalendarSyncInterval.getProperty(*getNode(sourcePropCalendarSyncInterval)); }
++InitStateString SyncSourceConfig::getSyncInterval() const {
++    InitStateString interval = sourcePropCalendarSyncInterval.getProperty(*getNode(sourcePropCalendarSyncInterval));
++    if (interval.empty()) {
++        interval = InitStateString("90", false);
++    }
++    return interval;
++}
+ void SyncSourceConfig::setSyncInterval(const string &value, bool temporarily) {
+-    sourcePropCalendarSyncInterval.setProperty(*getNode(sourcePropCalendarSyncInterval), value, temporarily); 
++    sourcePropCalendarSyncInterval.setProperty(*getNode(sourcePropCalendarSyncInterval), value, temporarily);
+ }
+ 
+ string SyncSourceConfig::getStartDate() const
+-- 
+2.1.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-21 16:32:22 +0000
+++ debian/patches/series	2015-01-27 19:51:10 +0000
@@ -3,3 +3,4 @@
 0002-Avoid-register-unecessary-timezones.patch
 fix-photo-merging.patch
 calendar-limit-date-sync.diff
+Use-90-days-as-default-value-for-syncInterval.patch