Maya

Merge lp:~elementary-dev-community/maya/evolution-data-server-3.16 into lp:~elementary-apps/maya/trunk

  1. evolution-data-server-3.16
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Approved by: Corentin Noël
Approved revision: 819
Merged at revision: 824
Proposed branch: lp:~elementary-dev-community/maya/evolution-data-server-3.16
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
core/Model/CalendarModel.vala (+1/-1)
vapi/libecalendar-1.2.vapi (+1/-1)
To merge this branch: bzr merge lp:~elementary-dev-community/maya/evolution-data-server-3.16
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+274429@code.launchpad.net

Commit message

Compatible with EDS 3.16

Description of the change

Make it compatible with EDS 3.16

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'core/Model/CalendarModel.vala'
2--- core/Model/CalendarModel.vala 2015-01-16 23:38:19 +0000
3+++ core/Model/CalendarModel.vala 2015-10-14 16:16:29 +0000
4@@ -362,7 +362,7 @@
5 try {
6 var cancellable = new GLib.Cancellable ();
7 connecting (source, cancellable);
8- var client = new E.CalClient.connect_sync (source, E.CalClientSourceType.EVENTS, cancellable);
9+ var client = new E.CalClient.connect_sync (source, E.CalClientSourceType.EVENTS, 30, cancellable);
10 source_client.insert (source.dup_uid (), client);
11 } catch (Error e) {
12 error_received (e.message);
13
14=== modified file 'vapi/libecalendar-1.2.vapi'
15--- vapi/libecalendar-1.2.vapi 2014-12-31 16:11:57 +0000
16+++ vapi/libecalendar-1.2.vapi 2015-10-14 16:16:29 +0000
17@@ -24,7 +24,7 @@
18 public CalClient (E.Source source, E.CalClientSourceType source_type) throws GLib.Error;
19 public virtual async void connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable? cancellable) throws GLib.Error;
20 [CCode (has_construct_function = false, cname = "e_cal_client_connect_sync")]
21- public CalClient.connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
22+ public CalClient.connect_sync (E.Source source, E.CalClientSourceType source_type, int32 wait_for_connected_seconds, GLib.Cancellable? cancellable = null) throws GLib.Error;
23 public async bool add_timezone (iCal.TimeZone zone, GLib.Cancellable cancellable) throws GLib.Error;
24 public bool add_timezone_sync (iCal.TimeZone zone, GLib.Cancellable cancellable) throws GLib.Error;
25 public bool check_one_alarm_only ();

Subscribers

People subscribed via source and target branches