Corentin Noël has proposed merging
lp:~elementary-dev-community/maya/evolution-data-server-3.16 into lp:maya.
Requested reviews:
elementary Apps team (elementary-apps)
For more details, see:
https://code.launchpad.net/~elementary-dev-community/maya/evolution-data-server-3.16/+merge/274429
Make it compatible with EDS 3.16
--
Your team elementary Developer Community is subscribed to branch
lp:~elementary-dev-community/maya/evolution-data-server-3.16.
=== modified file 'core/Model/CalendarModel.vala'
--- core/Model/CalendarModel.vala 2015-01-16 23:38:19 +
+++ core/Model/CalendarModel.vala 2015-10-14 16:16:29 +
@@ -362,7 +362,7 @@
try {
var cancellable = new GLib.Cancellable ();
connecting (source, cancellable);
-var client = new E.CalClient.connect_sync (source, E.CalClientSourceType.EVENTS, cancellable);
+var client = new E.CalClient.connect_sync (source, E.CalClientSourceType.EVENTS, 30, cancellable);
source_client.insert (source.dup_uid (), client);
} catch (Error e) {
error_received (e.message);
=== modified file 'vapi/libecalendar-1.2.vapi'
--- vapi/libecalendar-1.2.vapi 2014-12-31 16:11:57 +
+++ vapi/libecalendar-1.2.vapi 2015-10-14 16:16:29 +
@@ -24,7 +24,7 @@
public CalClient (E.Source source, E.CalClientSourceType source_type) throws GLib.Error;
public virtual async void connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable? cancellable) throws GLib.Error;
[CCode (has_construct_function = false, cname = "e_cal_client_connect_sync")]
- public CalClient.connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ public CalClient.connect_sync (E.Source source, E.CalClientSourceType source_type, int32 wait_for_connected_seconds, GLib.Cancellable? cancellable = null) throws GLib.Error;
public async bool add_timezone (iCal.TimeZone zone, GLib.Cancellable cancellable) throws GLib.Error;
public bool add_timezone_sync (iCal.TimeZone zone, GLib.Cancellable cancellable) throws GLib.Error;
public bool check_one_alarm_only ();
--
Mailing list: https://launchpad.net/~elementary-dev-community
Post to : elementary-dev-community@lists.launchpad.net
Unsubscribe : https://launchpad.net/~elementary-dev-community
More help : https://help.launchpad.net/ListHelp
