Merge lp:~wingpanel-devs/wingpanel-indicator-datetime/fresh-ui into lp:~wingpanel-devs/wingpanel-indicator-datetime/trunk

[Danielle Foré]

add new calendar widget in maya style

This branch provides a new calendar widget in the style of the calendar in maya.
These classes are from maya and are slightly tweaked for the new context.
  Widgets/calendar/CalendarModel.vala
  Widgets/calendar/CalendarView.vala
  Widgets/calendar/ControlHeader.vala
  Widgets/calendar/Util.vala
  Widgets/calendar/Grid.vala
  Widgets/calendar/GridDay.vala
  Widgets/calendar/Header.vala
  Widgets/calendar/WeekLabels.vala
The vapi files are also copied from maya.

So new code is
Widgets/calendar/Calendar.vala
and in Indicator.vala

[lp:~wingpanel-devs/wingpanel-indicator-datetime/fresh-ui]

34. By Djax on 2016-01-12

merge trunk

[Danielle Foré (danrabbit)]

* This branch causes wingpanel to delay loading by about 30 seconds
* We should show units (F or C) with temperature

[lp:~wingpanel-devs/wingpanel-indicator-datetime/fresh-ui]

35. By Djax on 2016-01-12

don't delay 30s while eds connect, F and C for the temp

36. By Djax on 2016-01-12

use locale measurement for temperature unit

37. By Djax on 2016-01-16

remove imperial-regions prop

38. By Djax on 2016-01-16

minor fixes

39. By Djax on 2016-02-03

remove weather stuff

40. By Djax on 2016-02-03

drop commented out code

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-19 21:46:36 +0000
+++ CMakeLists.txt	2016-02-03 23:24:26 +0000
@@ -37,14 +37,17 @@
 # Traslation stuff
 add_subdirectory (po)
 
+# GSettings schema
+add_subdirectory (schemas)
+
 # Code
 add_subdirectory(src)
 
 # Uninstall target
 configure_file(
-    "${CMAKE_SOURCE_DIR}/cmake/Uninstall.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
-    IMMEDIATE @ONLY)
+  "${CMAKE_SOURCE_DIR}/cmake/Uninstall.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+  IMMEDIATE @ONLY)
 
 add_custom_target(uninstall
-     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake)
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake)

=== added directory 'schemas'
=== added file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ schemas/CMakeLists.txt	2016-02-03 23:24:26 +0000
@@ -0,0 +1,2 @@
+include(GSettings)
+add_schema("org.pantheon.desktop.wingpanel.indicators.datetime.gschema.xml")

=== added file 'schemas/org.pantheon.desktop.wingpanel.indicators.datetime.gschema.xml'
--- schemas/org.pantheon.desktop.wingpanel.indicators.datetime.gschema.xml	1970-01-01 00:00:00 +0000
+++ schemas/org.pantheon.desktop.wingpanel.indicators.datetime.gschema.xml	2016-02-03 23:24:26 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+    <schema path="/org/pantheon/desktop/wingpanel/indicators/datetime/" id="org.pantheon.desktop.wingpanel.indicators.datetime" gettext-domain="datetime-indicator">
+        <key type="b" name="show-weeks">
+            <default>false</default>
+            <summary>Show week numbers.</summary>
+            <description>If this is set to true, week numbers will be shown in the calendar.</description>
+        </key>
+    </schema>
+</schemalist>
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-05-03 11:51:04 +0000
+++ src/CMakeLists.txt	2016-02-03 23:24:26 +0000
@@ -1,7 +1,8 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0 granite)
+pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0 granite
+  libecal-1.2 libical libsoup-2.4 libedataserver-1.2)
 
 add_definitions (${DEPS_CFLAGS})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -15,13 +16,29 @@
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
   Indicator.vala
   Widgets/PanelLabel.vala
-  Widgets/Calendar.vala
+  Widgets/calendar/Calendar.vala
+  Widgets/calendar/CalendarModel.vala
+  Widgets/calendar/CalendarView.vala
+  Widgets/calendar/ControlHeader.vala
+  Widgets/calendar/Util.vala
+  Widgets/calendar/Grid.vala
+  Widgets/calendar/GridDay.vala
+  Widgets/calendar/Header.vala
+  Widgets/calendar/WeekLabels.vala
   Services/TimeManager.vala
+  Services/SettingsManager.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
   wingpanel-2.0
+  glib-2.0>=2.32
   granite
+  libecalendar-1.2
+  libedataserver-1.2
+  libical
+  libsoup-2.4
 OPTIONS
+  --target-glib=2.32
+  --vapidir=${CMAKE_SOURCE_DIR}/vapi
   --thread
 )
 

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-10-20 21:45:31 +0000
+++ src/Indicator.vala	2016-02-03 23:24:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ * Copyright (c) 2011-2016 Wingpanel Developers (http://launchpad.net/wingpanel)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -24,12 +24,15 @@
 
     private Gtk.Grid main_grid;
 
-    private Wingpanel.Widgets.Button today_button;
+    private Gtk.Label weekday_label;
+    private Gtk.Label date_label;
 
     private Widgets.Calendar calendar;
 
     private Wingpanel.Widgets.Button settings_button;
 
+    private Gtk.Box event_box;
+
     public Indicator () {
         Object (code_name: Wingpanel.Indicator.DATETIME,
                 display_name: _("Date & Time"),
@@ -46,21 +49,34 @@
 
     public override Gtk.Widget? get_widget () {
         if (main_grid == null) {
+            int position = 0;
             main_grid = new Gtk.Grid ();
 
-            today_button = new Wingpanel.Widgets.Button ("");
-            today_button.clicked.connect (() => {
-                calendar.show_today ();
-            });
+            weekday_label = new Gtk.Label ("");
+            weekday_label.get_style_context ().add_class ("h2");
+            weekday_label.halign = Gtk.Align.START;
+            weekday_label.margin_top = 10;
+            weekday_label.margin_start = 20;
+            main_grid.attach (weekday_label, 0, position++, 1, 1);
 
-            main_grid.attach (today_button, 0, 0, 1, 1);
+            date_label = new Gtk.Label ("");
+            date_label.get_style_context ().add_class ("h3");
+            date_label.halign = Gtk.Align.START;
+            date_label.margin_start = 20;
+            date_label.margin_top = 10;
+            date_label.margin_bottom = 15;
+            main_grid.attach (date_label, 0, position++, 1, 1);
 
             calendar = new Widgets.Calendar ();
-            calendar.date_doubleclicked.connect (() => {
+            calendar.day_double_click.connect (() => {
                 this.close ();
             });
-
-            main_grid.attach (calendar, 0, 1, 1, 1);
+            calendar.margin_bottom = 6;
+
+            main_grid.attach (calendar, 0, position++, 1, 1);
+
+            event_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            main_grid.attach (event_box, 0, position++, 1, 1);
 
             settings_button = new Wingpanel.Widgets.Button (_("Date & Time Settings…"));
             settings_button.clicked.connect (() => {
@@ -68,28 +84,61 @@
                 this.close ();
             });
 
-            main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 1, 1);
-
-            main_grid.attach (settings_button, 0, 3, 1, 1);
+            main_grid.attach (new Wingpanel.Widgets.Separator (), 0, position++, 1, 1);
+
+            main_grid.attach (settings_button, 0, position++, 1, 1);
+
+            calendar.selection_changed.connect ((date) => {
+                Idle.add (update_events);
+            });
         }
 
-        /* I do have something to display! */
         this.visible = true;
 
         return main_grid;
     }
 
+    private void update_events_model (E.Source source, Gee.Collection<E.CalComponent> events) {
+        Idle.add (update_events);
+    }
+
+    private bool update_events () {
+        foreach (var w in event_box.get_children ()) {
+            w.destroy ();
+        }
+        foreach (var e in Widgets.CalendarModel.get_default ().get_events (calendar.selected_date)) {
+                var but = new Wingpanel.Widgets.Button (e.get_label (), e.get_icon ());
+                event_box.add (but);
+                but.clicked.connect (() => {
+                    calendar.show_date_in_maya (e.date);
+                    this.close ();
+                });
+        }
+
+        event_box.show_all ();
+        return false;
+    }
+
     public override void opened () {
         update_today_button ();
+        calendar.show_today ();
+
         Services.TimeManager.get_default ().minute_changed.connect (update_today_button);
+        Widgets.CalendarModel.get_default ().events_added.connect (update_events_model);
+        Widgets.CalendarModel.get_default ().events_updated.connect (update_events_model);
+        Widgets.CalendarModel.get_default ().events_removed.connect (update_events_model);
     }
 
     public override void closed () {
         Services.TimeManager.get_default ().minute_changed.disconnect (update_today_button);
+        Widgets.CalendarModel.get_default ().events_added.disconnect (update_events_model);
+        Widgets.CalendarModel.get_default ().events_updated.disconnect (update_events_model);
+        Widgets.CalendarModel.get_default ().events_removed.disconnect (update_events_model);
     }
 
     private void update_today_button () {
-        today_button.set_caption (Services.TimeManager.get_default ().format (_("%A, %d. %B %Y")));
+        weekday_label.set_label (Services.TimeManager.get_default ().format ("%A"));
+        date_label.set_label (Services.TimeManager.get_default ().format (_("%B %d, %Y")));
     }
 
     private void show_settings () {
@@ -98,13 +147,8 @@
     }
 }
 
-public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
+public Wingpanel.Indicator get_indicator (Module module) {
     debug ("Activating DateTime Indicator");
-
-    if (server_type != Wingpanel.IndicatorManager.ServerType.SESSION) {
-        return null;
-    }
-
     var indicator = new DateTime.Indicator ();
 
     return indicator;

=== added file 'src/Services/SettingsManager.vala'
--- src/Services/SettingsManager.vala	1970-01-01 00:00:00 +0000
+++ src/Services/SettingsManager.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2011-2016 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class DateTime.Services.SettingsManager : Granite.Services.Settings {
+    private static SettingsManager? instance = null;
+
+    public bool show_weeks{ get; set; }
+
+    public SettingsManager () {
+        base ("org.pantheon.desktop.wingpanel.indicators.datetime");
+    }
+
+    public static SettingsManager get_default () {
+        if (instance == null) {
+            instance = new SettingsManager ();
+        }
+
+        return instance;
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/Calendar.vala'
--- src/Widgets/Calendar.vala	2015-10-20 21:45:32 +0000
+++ src/Widgets/Calendar.vala	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-public class DateTime.Widgets.Calendar : Gtk.Calendar {
-    private const string CALENDAR_EXEC = "/usr/bin/maya-calendar";
-
-    public signal void date_doubleclicked ();
-
-    public Calendar () {
-        this.margin_start = 10;
-        this.margin_end = 10;
-
-        this.day_selected_double_click.connect (() => {
-            show_date_in_maya ();
-            date_doubleclicked ();
-        });
-    }
-
-    public void show_today () {
-        var current_time = Services.TimeManager.get_default ().get_current_time ();
-
-        if (current_time == null) {
-            return;
-        }
-
-        this.select_month (current_time.get_month () - 1, current_time.get_year ());
-        this.select_day (current_time.get_day_of_month ());
-    }
-
-    /* TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. */
-    private void show_date_in_maya () {
-        uint selected_year, selected_month, selected_day;
-        this.get_date (out selected_year, out selected_month, out selected_day);
-
-        /* Month-correction */
-        selected_month += 1;
-
-        var parameter_string = @" --show-day $selected_day/$selected_month/$selected_year";
-        var command = CALENDAR_EXEC + parameter_string;
-
-        var cmd = new Granite.Services.SimpleCommand ("/usr/bin", command);
-        cmd.run ();
-    }
-}
\ No newline at end of file

=== added directory 'src/Widgets/calendar'
=== added file 'src/Widgets/calendar/Calendar.vala'
--- src/Widgets/calendar/Calendar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/Calendar.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2011-2016 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+namespace DateTime.Widgets {
+    public class Calendar : Gtk.Box {
+        private const string CALENDAR_EXEC = "/usr/bin/maya-calendar";
+
+        ControlHeader heading;
+        CalendarView cal;
+        public signal void selection_changed (GLib.DateTime new_date);
+        public signal void day_double_click (GLib.DateTime date);
+
+        public GLib.DateTime? selected_date { get {
+                return cal.selected_date;
+            } set {
+            }}
+
+        public Calendar () {
+            Object (orientation: Gtk.Orientation.VERTICAL, halign: Gtk.Align.CENTER, valign: Gtk.Align.CENTER, can_focus: false);
+            this.margin_start = 10;
+            this.margin_end = 10;
+            heading = new ControlHeader ();
+            cal = new CalendarView ();
+            cal.selection_changed.connect ((date) => {
+                selection_changed (date);
+            });
+            cal.on_event_add.connect ((date) => {
+                show_date_in_maya (date);
+                day_double_click (date);
+            });
+            heading.left_clicked.connect (() => {
+                CalendarModel.get_default ().change_month (-1);
+            });
+            heading.right_clicked.connect (() => {
+                CalendarModel.get_default ().change_month (1);
+            });
+            heading.center_clicked.connect (() => {
+                cal.today ();
+            });
+            add (heading);
+            add (cal);
+        }
+
+        public void show_today () {
+            cal.today ();
+        }
+
+        // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
+        public void show_date_in_maya (GLib.DateTime date) {
+            int selected_year, selected_month, selected_day;
+            selected_year = date.get_year ();
+            selected_month = date.get_month ();
+            selected_day= date.get_day_of_month ();
+
+            var parameter_string = @" --show-day $selected_day/$selected_month/$selected_year";
+            var command = CALENDAR_EXEC + parameter_string;
+
+            var cmd = new Granite.Services.SimpleCommand ("/usr/bin", command);
+            cmd.run ();
+        }
+
+        public override bool draw (Cairo.Context cr) {
+            base.draw (cr);
+            Gtk.Allocation size;
+            cal.get_allocation (out size);
+            cr.set_source_rgba (0.0, 0.0, 0.0, 0.25);
+            cr.set_line_width (1.0);
+            int y = 59;
+            int height = size.height - 25;
+            cr.move_to (4.5, y + 0.5);
+            cr.line_to (size.width - 4.5, y + 0.5);
+            cr.curve_to (size.width - 4.5, y + 0.5, size.width - 0.5, y + 0.5, size.width - 0.5, y + 4.5);
+            cr.line_to (size.width - 0.5, y + height - 4.5);
+            cr.curve_to (size.width - 0.5, y + height - 4.5, size.width - 0.5, y + height - 0.5, size.width - 4.5, y + height - 0.5);
+            cr.line_to (4.5, y + height - 0.5);
+            cr.curve_to (4.5, y + height - 0.5, 0.5, y + height - 0.5, 0.5, y + height - 4.5);
+            cr.line_to (0.5, y + 4.5);
+            cr.curve_to (0.5, y + 4.5, 0.5, y + 0.5, 4.5, y + 0.5);
+            cr.stroke ();
+
+            return false;
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/CalendarModel.vala'
--- src/Widgets/calendar/CalendarModel.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/CalendarModel.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,476 @@
+/*
+ * Copyright (c) 2011-2016 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+namespace DateTime.Widgets {
+    public class Event : GLib.Object {
+        public GLib.DateTime date;
+        Util.DateRange range;
+        public string summary;
+        public bool day_event = false;
+        public bool alarm = false;
+        public GLib.DateTime start_time;
+        public GLib.DateTime end_time;
+
+        public Event (GLib.DateTime date, Util.DateRange range, iCal.Component comp) {
+            this.date = date;
+            this.range = range;
+            this.summary = comp.get_summary ();
+
+            Util.get_local_datetimes_from_icalcomponent (comp, out start_time, out end_time);
+            if (end_time == null) {
+                alarm = true;
+            } else if (Util.is_the_all_day (start_time, end_time)) {
+                day_event = true;
+                return;
+            }
+        }
+
+        public string get_label () {
+            if (day_event) {
+                return summary;
+            } else if (alarm) {
+                return "%s - %s".printf (start_time.format (Util.TimeFormat ()), summary);
+            } else if (range.days > 0 && date.compare (range.first) != 0) {
+                return summary;
+            }
+            return "%s - %s".printf (summary, start_time.format (Util.TimeFormat ()));
+        }
+
+        public string get_icon () {
+            if (alarm) {
+                return "alarm-symbolic";
+            }
+            return "office-calendar-symbolic";
+        }
+    }
+
+    public class CalendarModel : Object {
+        /* The data_range is the range of dates for which this model is storing
+         * data. The month_range is a subset of this range corresponding to the
+         * calendar month that is being focused on. In summary:
+         *
+         * data_range.first <= month_range.first < month_range.last <= data_range.last
+         *
+         * There is no way to set the ranges publicly. They can only be modified by
+         * changing one of the following properties: month_start, num_weeks, and
+         * week_starts_on.
+         */
+        public Util.DateRange data_range { get; private set; }
+        public Util.DateRange month_range { get; private set; }
+        public E.SourceRegistry registry { get; private set; }
+
+        /* The first day of the month */
+        public GLib.DateTime month_start { get; set; }
+
+        /* The number of weeks to show in this model */
+        public int num_weeks { get; private set; default = 6; }
+
+        /* The start of week, ie. Monday=1 or Sunday=7 */
+        public Weekday week_starts_on { get; set; }
+
+        /* Notifies when events are added, updated, or removed */
+        public signal void events_added (E.Source source, Gee.Collection<E.CalComponent> events);
+        public signal void events_updated (E.Source source, Gee.Collection<E.CalComponent> events);
+        public signal void events_removed (E.Source source, Gee.Collection<E.CalComponent> events);
+
+        public signal void connecting (E.Source source, Cancellable cancellable);
+        public signal void connected (E.Source source);
+        public signal void error_received (string error);
+
+        /* The month_start, num_weeks, or week_starts_on have been changed */
+        public signal void parameters_changed ();
+
+        HashTable<string, E.CalClient> source_client;
+        HashTable<string, E.CalClientView> source_view;
+        HashTable<E.Source, Gee.TreeMap<string, E.CalComponent> > source_events;
+
+        private static CalendarModel? calendar_model = null;
+
+        public enum Weekday {
+            SUNDAY,
+            MONDAY,
+            TUESDAY,
+            WEDNESDAY,
+            THURSDAY,
+            FRIDAY,
+            SATURDAY
+        }
+
+        public static CalendarModel get_default () {
+            if (calendar_model == null) {
+                calendar_model = new CalendarModel ();
+                calendar_model.load_all_sources ();
+            }
+
+            return calendar_model;
+        }
+
+        private CalendarModel () {
+            /* It's dirty, but there is no other way to get it for the moment. */
+            string output;
+            int week_start = 2;
+            try {
+                GLib.Process.spawn_command_line_sync ("locale first_weekday", out output, null, null);
+                week_start = int.parse (output);
+            } catch (SpawnError e) {
+                critical (e.message);
+            }
+
+            switch (week_start) {
+                case 1 :
+                    week_starts_on = Weekday.SUNDAY;
+                    break;
+                case 2:
+                    week_starts_on = Weekday.MONDAY;
+                    break;
+                case 3:
+                    week_starts_on = Weekday.TUESDAY;
+                    break;
+                case 4:
+                    week_starts_on = Weekday.WEDNESDAY;
+                    break;
+                case 5:
+                    week_starts_on = Weekday.THURSDAY;
+                    break;
+                case 6:
+                    week_starts_on = Weekday.FRIDAY;
+                    break;
+                case 7:
+                    week_starts_on = Weekday.SATURDAY;
+                    break;
+                default:
+                    week_starts_on = Weekday.MONDAY;
+                    message ("Locale has a bad first_weekday value");
+                    break;
+            }
+
+            this.month_start = Util.get_start_of_month ();
+            compute_ranges ();
+
+            source_client = new HashTable<string, E.CalClient> (str_hash, str_equal);
+            source_events = new HashTable<E.Source, Gee.TreeMap<string, E.CalComponent> > (Util.source_hash_func, Util.source_equal_func);
+            source_view = new HashTable<string, E.CalClientView> (str_hash, str_equal);
+
+            notify["month-start"].connect (on_parameter_changed);
+            try {
+                registry = new E.SourceRegistry.sync (null);
+                registry.source_removed.connect (remove_source);
+                registry.source_changed.connect (on_source_changed);
+                registry.source_added.connect (add_source);
+
+                /* Add sources */
+                foreach (var source in registry.list_sources (E.SOURCE_EXTENSION_CALENDAR)) {
+                    E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
+
+                    if (cal.selected == true && source.enabled == true) {
+                        add_source (source);
+                    }
+                }
+            } catch (GLib.Error error) {
+                critical (error.message);
+            }
+        }
+
+        /* --- Public Methods ---// */
+
+        public Gee.ArrayList<Event> get_events (GLib.DateTime date) {
+            var events_on_day = new Gee.TreeMap<string,Event> ();
+            foreach (var entry in source_events.get_values ()) {
+                foreach (var comp in entry.values) {
+                    unowned iCal.Component ical = comp.get_icalcomponent ();
+                    foreach (var dt_range in Util.event_date_ranges (ical, data_range)) {
+                        if (dt_range.contains (date)) {
+                            if (!events_on_day.has_key (ical.get_uid ())) {
+                                events_on_day.set (ical.get_uid (), new Event (date, dt_range, ical));
+                            }
+                        }
+                    }
+                }
+            }
+            var list = new Gee.ArrayList<Event>.wrap (events_on_day.values.to_array ());
+            list.sort (sort_events);
+            return list;
+        }
+
+        public int sort_events (Event e1, Event e2) {
+            if (e1.start_time.compare (e2.start_time) != 0)
+                return e1.start_time.compare(e2.start_time);
+
+            // If they have the same date, sort them wholeday first
+            if (e1.day_event)
+                return -1;
+            if (e2.day_event)
+                return 1;
+            return 0;
+        }
+
+        public bool calclient_is_readonly (E.Source source) {
+            E.CalClient client;
+            lock (source_client) {
+                client = source_client.get (source.dup_uid ());
+            }
+
+            if (client != null) {
+                return client.is_readonly ();
+            } else {
+                critical ("No calendar client was found");
+            }
+
+            return true;
+        }
+
+        public void load_all_sources () {
+            lock (source_client) {
+                foreach (var id in source_client.get_keys ()) {
+                    var source = registry.ref_source (id);
+                    E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
+
+                    if (cal.selected == true && source.enabled == true) {
+                        load_source (source);
+                    }
+                }
+            }
+        }
+
+        public void add_source (E.Source source) {
+            add_source_async.begin (source);
+        }
+
+        public void remove_source (E.Source source) {
+            debug ("Removing source '%s'", source.dup_display_name ());
+            /* Already out of the model, so do nothing */
+            var uid = source.dup_uid ();
+
+            if (!source_view.contains (uid)) {
+                return;
+            }
+
+            var current_view = source_view.get (uid);
+            try {
+                current_view.stop ();
+            } catch (Error e) {
+                warning (e.message);
+            }
+
+            source_view.remove (uid);
+            lock (source_client) {
+                source_client.remove (uid);
+            }
+
+            var events = source_events.get (source).values.read_only_view;
+            events_removed (source, events);
+            source_events.remove (source);
+        }
+
+        public void change_month (int relative) {
+            month_start = month_start.add_months (relative);
+        }
+
+        public void change_year (int relative) {
+            month_start = month_start.add_years (relative);
+        }
+
+        /* --- Helper Methods ---// */
+
+        private void compute_ranges () {
+            var month_end = month_start.add_full (0, 1, -1);
+            month_range = new Util.DateRange (month_start, month_end);
+
+            int dow = month_start.get_day_of_week ();
+            int wso = (int)week_starts_on;
+            int offset = 0;
+
+            if (wso < dow) {
+                offset = dow - wso;
+            } else if (wso > dow) {
+                offset = 7 + dow - wso;
+            }
+
+            var data_range_first = month_start.add_days (-offset);
+
+            dow = month_end.get_day_of_week ();
+            wso = (int)(week_starts_on + 6);
+
+            /* WSO must be between 1 and 7 */
+            if (wso > 7) {
+                wso = wso - 7;
+            }
+
+            offset = 0;
+
+            if (wso < dow) {
+                offset = 7 + wso - dow;
+            } else if (wso > dow) {
+                offset = wso - dow;
+            }
+
+            var data_range_last = month_end.add_days (offset);
+
+            data_range = new Util.DateRange (data_range_first, data_range_last);
+            num_weeks = data_range.to_list ().size / 7;
+
+            debug (@"Date ranges: ($data_range_first <= $month_start < $month_end <= $data_range_last)");
+        }
+
+        private void load_source (E.Source source) {
+            /* create empty source-event map */
+            var events = new Gee.TreeMap<string, E.CalComponent> (
+                (GLib.CompareDataFunc<E.CalComponent> ? )GLib.strcmp,
+                (Gee.EqualDataFunc<E.CalComponent>? )Util.calcomponent_equal_func);
+            source_events.set (source, events);
+            /* query client view */
+            var iso_first = E.Util.isodate_from_time_t ((time_t)data_range.first.to_unix ());
+            var iso_last = E.Util.isodate_from_time_t ((time_t)data_range.last.add_days (1).to_unix ());
+            var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))";
+
+            E.CalClient client;
+            lock (source_client) {
+                client = source_client.get (source.dup_uid ());
+            }
+
+            if (client == null) {
+                return;
+            }
+
+            debug ("Getting client-view for source '%s'", source.dup_display_name ());
+            client.get_view.begin (query, null, (obj, results) => {
+                var view = on_client_view_received (results, source, client);
+                view.objects_added.connect ((objects) => on_objects_added (source, client, objects));
+                view.objects_removed.connect ((objects) => on_objects_removed (source, client, objects));
+                view.objects_modified.connect ((objects) => on_objects_modified (source, client, objects));
+                try {
+                    view.start ();
+                } catch (Error e) {
+                    critical (e.message);
+                }
+
+                source_view.set (source.dup_uid (), view);
+            });
+        }
+
+        private async void add_source_async (E.Source source) {
+            debug ("Adding source '%s'", source.dup_display_name ());
+            try {
+                var cancellable = new GLib.Cancellable ();
+                connecting (source, cancellable);
+                var client = new E.CalClient.connect_sync (source, E.CalClientSourceType.EVENTS, -1, cancellable);
+                source_client.insert (source.dup_uid (), client);
+            } catch (Error e) {
+                error_received (e.message);
+            }
+
+            Idle.add (() => {
+                connected (source);
+                load_source (source);
+
+                return false;
+            });
+        }
+
+        private void debug_event (E.Source source, E.CalComponent event) {
+            unowned iCal.Component comp = event.get_icalcomponent ();
+            debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]");
+        }
+
+        /* --- Signal Handlers ---// */
+        private void on_parameter_changed () {
+            compute_ranges ();
+            load_all_sources ();
+            parameters_changed ();
+        }
+
+        private void on_source_changed (E.Source source) {
+        }
+
+        private E.CalClientView on_client_view_received (AsyncResult results, E.Source source, E.CalClient client) {
+            E.CalClientView view;
+            try {
+                debug (@"Received client-view for source '%s'", source.dup_display_name ());
+                bool status = client.get_view.end (results, out view);
+                assert (status == true);
+            } catch (Error e) {
+                critical ("Error loading client-view from source '%s': %s", source.dup_display_name (), e.message);
+            }
+
+            return view;
+        }
+
+        private void on_objects_added (E.Source source, E.CalClient client, SList<unowned iCal.Component> objects) {
+            debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ());
+            var events_from_source = source_events.get (source);
+            var added_events = new Gee.ArrayList<E.CalComponent> ((Gee.EqualDataFunc<E.CalComponent>? )Util.calcomponent_equal_func);
+
+            foreach (unowned iCal.Component comp in objects) {
+                var event = new E.CalComponent ();
+                event.set_icalcomponent (new iCal.Component.clone (comp));
+                string uid = comp.get_uid ();
+                debug_event (source, event);
+                events_from_source.set (uid, event);
+                added_events.add (event);
+            }
+
+            events_added (source, added_events.read_only_view);
+        }
+
+        private void on_objects_modified (E.Source source, E.CalClient client, SList<unowned iCal.Component> objects) {
+            debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ());
+            var updated_events = new Gee.ArrayList<E.CalComponent> ((Gee.EqualDataFunc<E.CalComponent>? )Util.calcomponent_equal_func);
+
+            foreach (unowned iCal.Component comp in objects) {
+                string uid = comp.get_uid ();
+                E.CalComponent event = source_events.get (source).get (uid);
+                event.set_icalcomponent (new iCal.Component.clone (comp));
+                updated_events.add (event);
+                debug_event (source, event);
+            }
+           
+            events_updated (source, updated_events.read_only_view);
+        }
+
+        private void on_objects_removed (E.Source source, E.CalClient client, SList<unowned E.CalComponentId? > cids) {
+            debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ());
+            var events_from_source = source_events.get (source);
+            var removed_events = new Gee.ArrayList<E.CalComponent> ((Gee.EqualDataFunc<E.CalComponent>? )Util.calcomponent_equal_func);
+
+            foreach (unowned E.CalComponentId? cid in cids) {
+                assert (cid != null);
+                E.CalComponent event = events_from_source.get (cid.uid);
+                removed_events.add (event);
+                debug_event (source, event);
+            }
+
+            events_removed (source, removed_events.read_only_view);
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/CalendarView.vala'
--- src/Widgets/calendar/CalendarView.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/CalendarView.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,161 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2011-2015 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Maxwell Barvian
+ *              Corentin Noël <[e-mail]>
+ */
+
+/**
+ * Represents the entire calendar, including the headers, the week labels and the grid.
+ */
+public class DateTime.Widgets.CalendarView : Gtk.Grid {
+    /*
+     * Event emitted when the day is double clicked or the ENTER key is pressed.
+     */
+    public signal void on_event_add (GLib.DateTime date);
+    public signal void selection_changed (GLib.DateTime new_date);
+    public signal void event_updates ();
+
+    public GLib.DateTime? selected_date { get; private set; }
+
+    private WeekLabels weeks { get; private set; }
+    private Header header { get; private set; }
+    private Grid grid { get; private set; }
+    private Gtk.Stack stack { get; private set; }
+    private Gtk.Grid big_grid { get; private set; }
+
+    public CalendarView () {
+        big_grid = create_big_grid ();
+
+        stack = new Gtk.Stack ();
+        stack.add (big_grid);
+        stack.show_all ();
+        stack.expand = true;
+
+        sync_with_model ();
+
+        var model = CalendarModel.get_default ();
+        model.parameters_changed.connect (on_model_parameters_changed);
+
+        Services.SettingsManager.get_default ().changed["show-weeks"].connect (on_show_weeks_changed);
+        events |= Gdk.EventMask.BUTTON_PRESS_MASK;
+        events |= Gdk.EventMask.KEY_PRESS_MASK;
+        events |= Gdk.EventMask.SCROLL_MASK;
+        events |= Gdk.EventMask.SMOOTH_SCROLL_MASK;
+        add (stack);
+    }
+
+    public Gtk.Grid create_big_grid () {
+        weeks = new WeekLabels ();
+        weeks.notify["child-revealed"].connect (() => {
+            header.queue_draw ();
+        });
+
+        header = new Header ();
+        grid = new Grid ();
+        grid.on_event_add.connect ((date) => on_event_add (date));
+        grid.selection_changed.connect ((date) => {
+            selected_date = date;
+            selection_changed (date);
+        });
+
+        // Grid properties
+        var new_big_grid = new Gtk.Grid ();
+        new_big_grid.attach (header, 1, 0, 1, 1);
+        new_big_grid.attach (grid, 1, 1, 1, 1);
+        new_big_grid.attach (weeks, 0, 1, 1, 1);
+        new_big_grid.show_all ();
+        new_big_grid.expand = true;
+        return new_big_grid;
+    }
+
+    public override bool scroll_event (Gdk.EventScroll event) {
+        return Util.on_scroll_event (event);
+    }
+
+    //--- Public Methods ---//
+
+    public void today () {
+        var calmodel = CalendarModel.get_default ();
+        var today = Util.strip_time (new GLib.DateTime.now_local ());
+        var start = Util.get_start_of_month (today);
+        selected_date = today;
+        if (!start.equal (calmodel.month_start))
+            calmodel.month_start = start;
+        sync_with_model ();
+        grid.focus_date (today);
+    }
+
+    //--- Signal Handlers ---//
+
+    void on_show_weeks_changed () {
+        var model = CalendarModel.get_default ();
+        weeks.update (model.data_range.first, model.num_weeks);
+    }
+
+    /* Indicates the month has changed */
+    void on_model_parameters_changed () {
+        var model = CalendarModel.get_default ();
+        if (grid.grid_range != null && model.data_range.equals (grid.grid_range))
+            return; // nothing to do
+
+        Idle.add ( () => {
+            sync_with_model ();
+            return false;
+        });
+    }
+
+    //--- Helper Methods ---//
+
+    /* Sets the calendar widgets to the date range of the model */
+    void sync_with_model () {
+        var model = CalendarModel.get_default ();
+        if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first.compare (model.data_range.first) == 0))
+            return; // nothing to do
+
+        GLib.DateTime previous_first = null;
+        if (grid.grid_range != null)
+            previous_first = grid.grid_range.first;
+        var previous_big_grid = big_grid;
+        big_grid = create_big_grid ();
+        stack.add (big_grid);
+
+        header.update_columns (model.week_starts_on);
+        weeks.update (model.data_range.first, model.num_weeks);
+        grid.set_range (model.data_range, model.month_start);
+
+        // keep focus date on the same day of the month
+        if (selected_date != null) {
+            var bumpdate = model.month_start.add_days (selected_date.get_day_of_month() - 1);
+            grid.focus_date (bumpdate);
+        }
+
+        if (previous_first != null) {
+            if (previous_first.compare (grid.grid_range.first) == -1) {
+                stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT;
+            } else {
+                stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT;
+            }
+        }
+
+        stack.set_visible_child (big_grid);
+        Timeout.add (stack.transition_duration, () => {
+            previous_big_grid.destroy ();
+            return false;
+        });
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/ControlHeader.vala'
--- src/Widgets/calendar/ControlHeader.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/ControlHeader.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011-2016 elementary Developers (https://launchpad.net/elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+namespace DateTime.Widgets {
+    public class ControlHeader : Gtk.Box {
+        public signal void left_clicked ();
+        public signal void right_clicked ();
+        public signal void center_clicked ();
+        public ControlHeader () {
+            Object (orientation : Gtk.Orientation.HORIZONTAL);
+            var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic");
+            var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic");
+            var center_button = new Gtk.Button.with_label (CalendarModel.get_default ().month_start.format ("%B %Y"));
+            CalendarModel.get_default ().parameters_changed.connect (() => {
+                var date = CalendarModel.get_default ().month_start;
+                center_button.set_label (date.format ("%B %Y"));
+            });
+            left_button.clicked.connect (() => {
+                left_clicked ();
+            });
+            right_button.clicked.connect (() => {
+                right_clicked ();
+            });
+            center_button.clicked.connect (() => {
+                center_clicked ();
+            });
+            left_button.can_focus = false;
+            right_button.can_focus = false;
+            center_button.can_focus = false;
+            add (left_button);
+            pack_end (right_button, false, false, 0);
+            pack_end (center_button, true, true, 0);
+            margin_bottom = 4;
+            get_style_context ().add_class ("linked");
+            set_size_request (-1, 30);
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/Grid.vala'
--- src/Widgets/calendar/Grid.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/Grid.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2011-2016 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Maxwell Barvian
+ *              Corentin Noël <[e-mail]>
+ */
+
+namespace DateTime.Widgets {
+/**
+ * Represents the entire date grid as a table.
+ */
+    public class Grid : Gtk.Grid {
+        Gee.HashMap<uint, GridDay> data;
+
+        public Util.DateRange grid_range { get; private set; }
+
+        /*
+         * Event emitted when the day is double clicked or the ENTER key is pressed.
+         */
+        public signal void on_event_add (GLib.DateTime date);
+
+        public signal void selection_changed (GLib.DateTime new_date);
+
+        private GridDay selected_gridday;
+
+        public Grid () {
+            /* Gtk.Grid properties */
+            insert_column (7);
+            set_column_homogeneous (true);
+            set_row_homogeneous (true);
+            column_spacing = 0;
+            row_spacing = 0;
+
+            data = new Gee.HashMap<uint, GridDay> ();
+            events |= Gdk.EventMask.SCROLL_MASK;
+            events |= Gdk.EventMask.SMOOTH_SCROLL_MASK;
+        }
+
+        void on_day_focus_in (GridDay day) {
+            debug ("on_day_focus_in "+day.date.to_string ());
+            if (selected_gridday != null) {
+                selected_gridday.set_selected (false);
+            }
+
+            var selected_date = day.date;
+            selected_gridday = day;
+            day.set_selected (true);
+            day.set_state_flags (Gtk.StateFlags.FOCUSED, false);
+            selection_changed (selected_date);
+            var calmodel = CalendarModel.get_default ();
+            var date_month = selected_date.get_month () - calmodel.month_start.get_month ();
+            var date_year = selected_date.get_year () - calmodel.month_start.get_year ();
+
+            if (date_month != 0 || date_year != 0) {
+                calmodel.change_month (date_month);
+                calmodel.change_year (date_year);
+            }
+        }
+
+        public void focus_date (GLib.DateTime date) {
+            debug (@"Setting focus to @ $(date)");
+            var date_hash = day_hash (date);
+
+            if (data.has_key (date_hash) == true) {
+                var day_widget = data.get (date_hash);
+                day_widget.grab_focus ();
+                on_day_focus_in (day_widget);
+            }
+        }
+
+        /**
+         * Sets the given range to be displayed in the grid. Note that the number of days
+         * must remain the same.
+         */
+        public void set_range (Util.DateRange new_range, GLib.DateTime month_start) {
+            var today = new GLib.DateTime.now_local ();
+
+            Gee.List<GLib.DateTime> old_dates;
+
+            if (grid_range == null) {
+                old_dates = new Gee.ArrayList<GLib.DateTime> ();
+            } else {
+                old_dates = grid_range.to_list ();
+            }
+
+            var new_dates = new_range.to_list ();
+
+            var data_new = new Gee.HashMap<uint, GridDay> ();
+
+            /* Assert that a valid number of weeks should be displayed */
+            assert (new_dates.size % 7 == 0);
+
+            /* Create new widgets for the new range */
+
+            int i = 0;
+            int col = 0, row = 0;
+
+            for (i = 0; i < new_dates.size; i++) {
+                var new_date = new_dates[i];
+                GridDay day;
+
+                if (i < old_dates.size) {
+                    /* A widget already exists for this date, just change it */
+
+                    var old_date = old_dates[i];
+                    day = update_day (data[day_hash (old_date)], new_date, today, month_start);
+                } else {
+                    /* Still update_day to get the color of etc. right */
+                    day = update_day (new GridDay (new_date, i), new_date, today, month_start);
+                    day.on_event_add.connect ((date) => on_event_add (date));
+                    day.scroll_event.connect ((event) => { scroll_event (event); return false; });
+                    day.focus_in_event.connect ((event) => {
+                        on_day_focus_in (day);
+
+                        return false;
+                    });
+
+                    attach (day, col, row, 1, 1);
+                    day.show_all ();
+                }
+
+                col = (col + 1) % 7;
+                row = (col == 0) ? row + 1 : row;
+                data_new.set (day_hash (new_date), day);
+            }
+
+            /* Destroy the widgets that are no longer used */
+            while (i < old_dates.size) {
+                /* There are widgets remaining that are no longer used, destroy them */
+                var old_date = old_dates[i];
+                var old_day = data.get (day_hash (old_date));
+
+                old_day.destroy ();
+                i++;
+            }
+
+            data.clear ();
+            data.set_all (data_new);
+
+            grid_range = new_range;
+        }
+
+        /**
+         * Updates the given GridDay so that it shows the given date. Changes to its style etc.
+         */
+        GridDay update_day (GridDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) {
+            if (new_date.get_day_of_year () == today.get_day_of_year () && new_date.get_year () == today.get_year ()) {
+                day.name = "today";
+                day.set_receives_default (true);
+            }
+            if (new_date.get_month () == month_start.get_month ()) {
+                day.sensitive_container (true);
+            } else {
+                day.sensitive_container (false);
+            }
+
+            day.update_date (new_date);
+
+            return day;
+        }
+
+        uint day_hash (GLib.DateTime date) {
+            return date.get_year () * 10000 + date.get_month () * 100 + date.get_day_of_month ();
+        }
+
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/GridDay.vala'
--- src/Widgets/calendar/GridDay.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/GridDay.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,132 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2011-2015 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Maxwell Barvian
+ *              Corentin Noël <[e-mail]>
+ */
+
+/**
+ * Represents a single day on the grid.
+ */
+public class DateTime.Widgets.GridDay : Gtk.EventBox {
+
+    /*
+     * Event emitted when the day is double clicked or the ENTER key is pressed.
+     */
+    public signal void on_event_add (GLib.DateTime date);
+
+    public GLib.DateTime date { get; private set; }
+    Gtk.Label label;
+    int id;
+    bool valid_grab = false;
+
+    public GridDay (GLib.DateTime date, int id) {
+        this.date = date;
+        this.id = id;
+
+        label = new Gtk.Label ("");
+        set_size_request (32, 25);
+        // EventBox Properties
+        can_focus = true;
+        events |= Gdk.EventMask.BUTTON_PRESS_MASK;
+        events |= Gdk.EventMask.KEY_PRESS_MASK;
+        events |= Gdk.EventMask.SMOOTH_SCROLL_MASK;
+        var style_provider = Util.Css.get_css_provider ();
+        get_style_context ().add_provider (style_provider, 600);
+        get_style_context ().add_class ("cell");
+
+        label.halign = Gtk.Align.CENTER;
+        label.valign = Gtk.Align.CENTER;
+        label.get_style_context ().add_provider (style_provider, 600);
+        label.name = "date";
+
+        add (label);
+        show_all ();
+
+        // Signals and handlers
+        button_press_event.connect (on_button_press);
+        key_press_event.connect (on_key_press);
+        scroll_event.connect ((event) => {return Util.on_scroll_event (event);});
+    }
+
+    public override bool draw (Cairo.Context cr) {
+        base.draw (cr);
+        Gtk.Allocation size;
+        get_allocation (out size);
+
+        cr.set_source_rgba (0.0, 0.0, 0.0, 0.25);
+        cr.set_line_width (1.0);
+
+        // Draw left and top black strokes
+        if (id % 7 == 0) {
+            cr.move_to (0.5, 0.5);
+        } else {
+            cr.move_to (0.5, size.height); // start in bottom left. 0.5 accounts for cairo's default stroke offset of 1/2 pixels
+            cr.line_to (0.5, 0.5); // move to upper left corner
+        }
+        if (id > 6) {
+            cr.line_to (size.width + 0.5, 0.5); // move to upper right corner
+        }
+        cr.stroke ();
+
+        // Draw inner highlight stroke
+        cr.rectangle (1, 1, size.width - 1, size.height - 1);
+        cr.set_source_rgba (1.0, 1.0, 1.0, 0.2);
+        cr.stroke ();
+        return false;
+    }
+
+    public void update_date (GLib.DateTime date) {
+        this.date = date;
+        label.label = date.get_day_of_month ().to_string ();
+    }
+
+    public void set_selected (bool selected) {
+        if (selected) {
+            set_state_flags (Gtk.StateFlags.SELECTED, true);
+        } else {
+            set_state_flags (Gtk.StateFlags.NORMAL, true);
+        }
+    }
+    public override void grab_focus () {
+        if (valid_grab) {
+            base.grab_focus ();
+            valid_grab = false;
+        }
+    }
+
+    public void sensitive_container (bool sens) {
+        label.sensitive = sens;
+    }
+
+    private bool on_button_press (Gdk.EventButton event) {
+        if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == Gdk.BUTTON_PRIMARY)
+            on_event_add (date);
+        valid_grab = true;
+        grab_focus ();
+        return false;
+    }
+
+    private bool on_key_press (Gdk.EventKey event) {
+        if (event.keyval == Gdk.keyval_from_name("Return") ) {
+            on_event_add (date);
+            return true;
+        }
+
+        return false;
+    }
+}

=== added file 'src/Widgets/calendar/Header.vala'
--- src/Widgets/calendar/Header.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/Header.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,69 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2011-2015 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Maxwell Barvian
+ *              Corentin Noël <[e-mail]>
+ */
+
+namespace DateTime.Widgets {
+
+/**
+ * Represents the header at the top of the calendar grid.
+ */
+public class Header : Gtk.EventBox {
+    private Gtk.Grid header_grid;
+    private Gtk.Label[] labels;
+
+    public bool draw_left_border = true;
+    public Header () {
+        events |= Gdk.EventMask.BUTTON_PRESS_MASK;
+
+        header_grid = new Gtk.Grid();
+        header_grid.insert_column (7);
+        header_grid.insert_row (1);
+        header_grid.set_column_homogeneous (true);
+        header_grid.set_row_homogeneous (true);
+        header_grid.column_spacing = 0;
+        header_grid.row_spacing = 0;
+        header_grid.margin_bottom = 4;
+
+        labels = new Gtk.Label[7];
+        for (int c = 0; c < 7; c++) {
+            labels[c] = new Gtk.Label ("");
+            labels[c].hexpand = true;
+            labels[c].margin_top = 4;
+            labels[c].margin_bottom = 2;
+            var label_grid = new Gtk.Grid ();
+            // label_grid.draw.connect (on_draw);
+            label_grid.add (labels[c]);
+            header_grid.attach (label_grid, c, 0, 1, 1);
+        }
+
+        add (header_grid);
+    }
+
+    public void update_columns (int week_starts_on) {
+        var date = Util.strip_time(new GLib.DateTime.now_local ());
+        date = date.add_days (week_starts_on - date.get_day_of_week ());
+        foreach (var label in labels) {
+            label.label = date.format ("%a");
+            date = date.add_days (1);
+        }
+    }
+}
+
+}

=== added file 'src/Widgets/calendar/Util.vala'
--- src/Widgets/calendar/Util.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/Util.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,813 @@
+/*
+ * Copyright (c) 2011-2016 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+namespace Util {
+    /* Represents date range from 'first' to 'last' inclusive */
+    public class DateRange : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterable<GLib.DateTime> {
+        public GLib.DateTime first { get; private set; }
+        public GLib.DateTime last { get; private set; }
+        public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) {
+            foreach (var date in this) {
+                if (f (date) == false) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public int64 days {
+            get {
+                return last.difference (first) / GLib.TimeSpan.DAY;
+            }
+        }
+
+        public DateRange (GLib.DateTime first, GLib.DateTime last) {
+            assert (first.compare (last) <= 0);
+            this.first = first;
+            this.last = last;
+        }
+
+        public DateRange.copy (DateRange date_range) {
+            this(date_range.first, date_range.last);
+        }
+
+        public bool equals (DateRange other) {
+            return (first == other.first && last == other.last);
+        }
+
+        public Type element_type {
+            get {
+                return typeof (GLib.DateTime);
+            }
+        }
+
+        public Gee.Iterator<GLib.DateTime> iterator () {
+            return new DateIterator (this);
+        }
+
+        public bool contains (GLib.DateTime time) {
+            return (first.compare (time) < 1) && (last.compare (time) > -1);
+        }
+
+        public Gee.SortedSet<GLib.DateTime> to_set () {
+            var @set = new Gee.TreeSet<GLib.DateTime> ((GLib.CompareDataFunc<GLib.DateTime>? )GLib.DateTime.compare);
+
+            foreach (var date in this) {
+                set.add (date);
+            }
+
+            return @set;
+        }
+
+        public Gee.List<GLib.DateTime> to_list () {
+            var list = new Gee.ArrayList<GLib.DateTime> ((Gee.EqualDataFunc<GLib.DateTime>? )datetime_equal_func);
+
+            foreach (var date in this) {
+                list.add (date);
+            }
+
+            return list;
+        }
+
+        /* Returns true if 'a' and 'b' are the same GLib.DateTime */
+        public bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) {
+            return a.equal (b);
+        }
+    }
+
+    public class DateIterator : Object, Gee.Traversable<GLib.DateTime>, Gee.Iterator<GLib.DateTime> {
+        GLib.DateTime current;
+        DateRange range;
+
+        public bool valid { get {
+                                return true;
+                            } }
+        public bool read_only { get {
+                                    return false;
+                                } }
+
+        public DateIterator (DateRange range) {
+            this.range = range;
+            this.current = range.first.add_days (-1);
+        }
+
+        public bool @foreach (Gee.ForallFunc<GLib.DateTime> f) {
+            var element = range.first;
+
+            while (element.compare (range.last) < 0) {
+                if (f (element) == false) {
+                    return false;
+                }
+
+                element = element.add_days (1);
+            }
+
+            return true;
+        }
+
+        public bool next () {
+            if (!has_next ()) {
+                return false;
+            }
+
+            current = this.current.add_days (1);
+
+            return true;
+        }
+
+        public bool has_next () {
+            return current.compare (range.last) < 0;
+        }
+
+        public bool first () {
+            current = range.first;
+
+            return true;
+        }
+
+        public new GLib.DateTime get () {
+            return current;
+        }
+
+        public void remove () {
+            assert_not_reached ();
+        }
+    }
+
+    public class Css {
+        private static Gtk.CssProvider? _css_provider;
+        /* Retrieve global css provider */
+        public static Gtk.CssProvider get_css_provider () {
+            if (_css_provider == null) {
+                _css_provider = new Gtk.CssProvider ();
+                try {
+                    _css_provider.load_from_data ("""
+@define-color cell_color mix(@bg_color, rgb(255, 255, 255), 0.8);
+@define-color cell_color_weekend mix(@bg_color, rgb(255, 255, 255), 0.2);
+@define-color text_color #333;
+
+/* Cell Styles */
+
+.cell {
+    background-color: @cell_color;
+    border-radius: 0;
+}
+
+.cell:insensitive {
+    background-color: shade(@cell_color, 0.97);
+}
+
+.cell:selected {
+    background-color: shade(@cell_color, 0.9);
+    color: @text_color;
+}
+
+#weekend {
+    background-color: @cell_color_weekend;
+}
+#weekend:selected {
+    background-color: shade(@cell_color, 0.9);
+}
+
+#today {
+    background-color: mix(@cell_color, @selected_bg_color, 0.15); /* today date has nice shade of blue */
+}
+
+#today:selected {
+    background-color: mix(@cell_color, @selected_bg_color, 0.35); /* today date has nice shade of blue */
+}
+
+    .cell > #date {
+        font-size: 10px;
+    }""", -1);
+                } catch (Error e) {
+                    warning ("Could not add css provider. Some widgets will not look as intended. %s", e.message);
+                }
+            }
+
+            return _css_provider;
+        }
+    }
+
+    public string TimeFormat () {
+        /* If AM/PM doesn't exist, use 24h. */
+        if (Posix.nl_langinfo (Posix.NLItem.AM_STR) == null || Posix.nl_langinfo (Posix.NLItem.AM_STR) == "") {
+            return Granite.DateTime.get_default_time_format (false);
+        }
+
+        /* If AM/PM exists, assume it is the default time format and check for format override. */
+        var setting = new GLib.Settings ("org.gnome.desktop.interface");
+        var clockformat = setting.get_user_value ("clock-format");
+
+        if (clockformat == null) {
+            return Granite.DateTime.get_default_time_format (true);
+        }
+
+        if (clockformat.get_string ().contains ("12h")) {
+            return Granite.DateTime.get_default_time_format (true);
+        } else {
+            return Granite.DateTime.get_default_time_format (false);
+        }
+    }
+
+    static bool has_scrolled = false;
+    const uint interval = 500;
+
+    public bool on_scroll_event (Gdk.EventScroll event) {
+        double delta_x;
+        double delta_y;
+        event.get_scroll_deltas (out delta_x, out delta_y);
+
+        double choice = delta_x;
+
+        if (((int)delta_x).abs () < ((int)delta_y).abs ()) {
+            choice = delta_y;
+        }
+
+        /* It's mouse scroll ! */
+        if (choice == 1 || choice == -1) {
+            DateTime.Widgets.CalendarModel.get_default ().change_month ((int)choice);
+
+            return true;
+        }
+
+        if (has_scrolled == true) {
+            return true;
+        }
+
+        if (choice > 0.3) {
+            reset_timer.begin ();
+            DateTime.Widgets.CalendarModel.get_default ().change_month (1);
+
+            return true;
+        }
+
+        if (choice < -0.3) {
+            reset_timer.begin ();
+            DateTime.Widgets.CalendarModel.get_default ().change_month (-1);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public GLib.DateTime get_start_of_month (owned GLib.DateTime? date = null) {
+        if (date == null) {
+            date = new GLib.DateTime.now_local ();
+        }
+
+        return new GLib.DateTime.local (date.get_year (), date.get_month (), 1, 0, 0, 0);
+    }
+
+    public GLib.DateTime strip_time (GLib.DateTime datetime) {
+        return datetime.add_full (0, 0, 0, -datetime.get_hour (), -datetime.get_minute (), -datetime.get_second ());
+    }
+
+    /**
+     * Converts the given TimeType to a DateTime.
+     */
+    public TimeZone timezone_from_ical (iCal.TimeType date) {
+        var interval = date.zone.get_utc_offset (date, date.is_daylight);
+        var hours = (interval / 3600);
+        string hour_string = "-";
+
+        if (hours >= 0) {
+            hour_string = "+";
+        }
+
+        hours = hours.abs ();
+
+        if (hours > 9) {
+            hour_string = "%s%d".printf (hour_string, hours);
+        } else {
+            hour_string = "%s0%d".printf (hour_string, hours);
+        }
+
+        var minutes = (interval.abs () % 3600) / 60;
+
+        if (minutes > 9) {
+            hour_string = "%s:%d".printf (hour_string, minutes);
+        } else {
+            hour_string = "%s:0%d".printf (hour_string, minutes);
+        }
+
+        return new TimeZone (hour_string);
+    }
+
+    /**
+     * Converts the given TimeType to a DateTime.
+     * XXX : Track next versions of evolution in order to convert iCal.Timezone to GLib.TimeZone with a dedicated function…
+     */
+    public GLib.DateTime ical_to_date_time (iCal.TimeType date) {
+        return new GLib.DateTime (timezone_from_ical (date), date.year, date.month,
+                                  date.day, date.hour, date.minute, date.second);
+    }
+
+    public void get_local_datetimes_from_icalcomponent (iCal.Component comp, out GLib.DateTime start_date, out GLib.DateTime end_date) {
+        iCal.TimeType dt_start = comp.get_dtstart ();
+        iCal.TimeType dt_end = comp.get_dtend ();
+
+        start_date = Util.ical_to_date_time (dt_start);
+        end_date = Util.ical_to_date_time (dt_end);
+    }
+
+    public Gee.Collection<DateRange> event_date_ranges (iCal.Component comp, Util.DateRange view_range) {
+        var dateranges = new Gee.LinkedList<DateRange> ();
+
+        var start = ical_to_date_time (comp.get_dtstart ());
+        var end = ical_to_date_time (comp.get_dtend ());
+
+        if (end == null) {
+            end = start;
+        }
+
+        /* All days events are stored in UTC time and should only being shown at one day. */
+        bool allday = is_the_all_day (start, end);
+
+        if (allday) {
+            end = end.add_days (-1);
+            var interval = (new GLib.DateTime.now_local ()).get_utc_offset ();
+            start = start.add (-interval);
+            end = end.add (-interval);
+        }
+
+        start = strip_time (start.to_timezone (new TimeZone.local ()));
+        end = strip_time (end.to_timezone (new TimeZone.local ()));
+        dateranges.add (new Util.DateRange (start, end));
+
+        /* Search for recursive events. */
+        unowned iCal.Property property = comp.get_first_property (iCal.PropertyKind.RRULE);
+
+        if (property != null) {
+            var rrule = property.get_rrule ();
+
+            switch (rrule.freq) {
+                case (iCal.RecurrenceTypeFrequency.WEEKLY) :
+                    generate_week_reccurence (dateranges, view_range, rrule, start, end);
+                    break;
+                case (iCal.RecurrenceTypeFrequency.MONTHLY) :
+                    generate_month_reccurence (dateranges, view_range, rrule, start, end);
+                    break;
+                case (iCal.RecurrenceTypeFrequency.YEARLY) :
+                    generate_year_reccurence (dateranges, view_range, rrule, start, end);
+                    break;
+                default :
+                    generate_day_reccurence (dateranges, view_range, rrule, start, end);
+                    break;
+            }
+        }
+
+        /* EXDATEs elements are exceptions dates that should not appear. */
+        property = comp.get_first_property (iCal.PropertyKind.EXDATE);
+
+        while (property != null) {
+            var exdate = property.get_exdate ();
+            var date = ical_to_date_time (exdate);
+            dateranges.@foreach ((daterange) => {
+                var first = daterange.first;
+                var last = daterange.last;
+
+                if (first.get_year () <= date.get_year () && last.get_year () >= date.get_year ()) {
+                    if (first.get_day_of_year () <= date.get_day_of_year () && last.get_day_of_year () >= date.get_day_of_year ()) {
+                        dateranges.remove (daterange);
+
+                        return false;
+                    }
+                }
+
+                return true;
+            });
+
+            property = comp.get_next_property (iCal.PropertyKind.EXDATE);
+        }
+
+        return dateranges;
+    }
+
+    private void generate_day_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+                                          iCal.RecurrenceType rrule, GLib.DateTime start, GLib.DateTime end) {
+        if (rrule.until.is_null_time () == 0) {
+            for (int i = 1; i <= (int)(rrule.until.day / rrule.interval); i++) {
+                int n = i * rrule.interval;
+
+                if (view_range.contains (start.add_days (n)) || view_range.contains (end.add_days (n))) {
+                    dateranges.add (new Util.DateRange (start.add_days (n), end.add_days (n)));
+                }
+            }
+        } else if (rrule.count > 0) {
+            for (int i = 1; i <= rrule.count; i++) {
+                int n = i * rrule.interval;
+
+                if (view_range.contains (start.add_days (n)) || view_range.contains (end.add_days (n))) {
+                    dateranges.add (new Util.DateRange (start.add_days (n), end.add_days (n)));
+                }
+            }
+        } else {
+            int i = 1;
+            int n = i * rrule.interval;
+
+            while (view_range.last.compare (start.add_days (n)) > 0) {
+                dateranges.add (new Util.DateRange (start.add_days (n), end.add_days (n)));
+                i++;
+                n = i * rrule.interval;
+            }
+        }
+    }
+
+    private void generate_year_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+                                           iCal.RecurrenceType rrule, GLib.DateTime start, GLib.DateTime end) {
+        if (rrule.until.is_null_time () == 0) {
+            /*for (int i = 0; i <= rrule.until.year; i++) {
+             *   int n = i*rrule.interval;
+             *   if (view_range.contains (start.add_years (n)) || view_range.contains (end.add_years (n)))
+             *       dateranges.add (new Util.DateRange (start.add_years (n), end.add_years (n)));
+             *  }*/
+        } else if (rrule.count > 0) {
+            for (int i = 1; i <= rrule.count; i++) {
+                int n = i * rrule.interval;
+
+                if (view_range.contains (start.add_years (n)) || view_range.contains (end.add_years (n))) {
+                    dateranges.add (new Util.DateRange (start.add_years (n), end.add_years (n)));
+                }
+            }
+        } else {
+            int i = 1;
+            int n = i * rrule.interval;
+            bool is_null_time = rrule.until.is_null_time () == 1;
+            var temp_start = start.add_years (n);
+
+            while (view_range.last.compare (temp_start) > 0) {
+                if (is_null_time == false) {
+                    if (temp_start.get_year () > rrule.until.year) {
+                        break;
+                    } else if (temp_start.get_year () == rrule.until.year && temp_start.get_month () > rrule.until.month) {
+                        break;
+                    } else if (temp_start.get_year () == rrule.until.year && temp_start.get_month () == rrule.until.month && temp_start.get_day_of_month () > rrule.until.day) {
+                        break;
+                    }
+                }
+
+                dateranges.add (new Util.DateRange (temp_start, end.add_years (n)));
+                i++;
+                n = i * rrule.interval;
+                temp_start = start.add_years (n);
+            }
+        }
+    }
+
+    private void generate_month_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+                                            iCal.RecurrenceType rrule, GLib.DateTime start, GLib.DateTime end) {
+        /* Computes month recurrences by day (for example: third friday of the month). */
+        for (int k = 0; k <= iCal.Size.BY_DAY; k++) {
+            if (rrule.by_day[k] < iCal.Size.BY_DAY) {
+                if (rrule.count > 0) {
+                    for (int i = 1; i <= rrule.count; i++) {
+                        int n = i * rrule.interval;
+                        var start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]);
+                        int interval = start_ical_day.get_day_of_month () - start.get_day_of_month ();
+                        dateranges.add (new Util.DateRange (start_ical_day, end.add_months (n).add_days (interval)));
+                    }
+                } else {
+                    int i = 1;
+                    int n = i * rrule.interval;
+                    bool is_null_time = rrule.until.is_null_time () == 1;
+                    var start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]);
+                    int week_of_month = (int)GLib.Math.ceil ((double)start.get_day_of_month () / 7);
+
+                    while (view_range.last.compare (start_ical_day) > 0) {
+                        if (is_null_time == false) {
+                            if (start_ical_day.get_year () > rrule.until.year) {
+                                break;
+                            } else if (start_ical_day.get_year () == rrule.until.year && start_ical_day.get_month () > rrule.until.month) {
+                                break;
+                            } else if (start_ical_day.get_year () == rrule.until.year && start_ical_day.get_month () == rrule.until.month && start_ical_day.get_day_of_month () > rrule.until.day) {
+                                break;
+                            }
+                        }
+
+                        /* Set it at the right weekday */
+                        int interval = start_ical_day.get_day_of_month () - start.get_day_of_month ();
+                        var start_daterange_date = start_ical_day;
+                        var end_daterange_date = end.add_months (n).add_days (interval);
+                        var new_week_of_month = (int)GLib.Math.ceil ((double)start_daterange_date.get_day_of_month () / 7);
+
+                        /* Set it at the right week */
+                        if (week_of_month != new_week_of_month) {
+                            start_daterange_date = start_daterange_date.add_weeks (week_of_month - new_week_of_month);
+                            end_daterange_date = end_daterange_date.add_weeks (week_of_month - new_week_of_month);
+                        }
+
+                        dateranges.add (new Util.DateRange (start_daterange_date, end_daterange_date));
+                        i++;
+                        n = i * rrule.interval;
+                        start_ical_day = get_date_from_ical_day (start.add_months (n), rrule.by_day[k]);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+
+        /* Computes month recurrences by month day (for example: 4th of the month). */
+        if (rrule.by_month_day[0] < iCal.Size.BY_MONTHDAY) {
+            if (rrule.count > 0) {
+                for (int i = 1; i <= rrule.count; i++) {
+                    int n = i * rrule.interval;
+                    dateranges.add (new Util.DateRange (start.add_months (n), end.add_months (n)));
+                }
+            } else {
+                int i = 1;
+                int n = i * rrule.interval;
+                bool is_null_time = rrule.until.is_null_time () == 1;
+                var temp_start = start.add_months (n);
+
+                while (view_range.last.compare (temp_start) > 0) {
+                    if (is_null_time == false) {
+                        if (temp_start.get_year () > rrule.until.year) {
+                            break;
+                        } else if (temp_start.get_year () == rrule.until.year && temp_start.get_month () > rrule.until.month) {
+                            break;
+                        } else if (temp_start.get_year () == rrule.until.year && temp_start.get_month () == rrule.until.month && temp_start.get_day_of_month () > rrule.until.day) {
+                            break;
+                        }
+                    }
+
+                    dateranges.add (new Util.DateRange (temp_start, end.add_months (n)));
+                    i++;
+                    n = i * rrule.interval;
+                    temp_start = start.add_months (n);
+                }
+            }
+        }
+    }
+
+    private void generate_week_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+                                           iCal.RecurrenceType rrule, GLib.DateTime start_, GLib.DateTime end_) {
+        GLib.DateTime start = start_;
+        GLib.DateTime end = end_;
+
+        for (int k = 0; k <= iCal.Size.BY_DAY; k++) {
+            if (rrule.by_day[k] > 7) {
+                break;
+            }
+
+            int day_to_add = 0;
+
+            switch (rrule.by_day[k]) {
+                case 1:
+                    day_to_add = 7 - start.get_day_of_week ();
+                    break;
+                case 2:
+                    day_to_add = 1 - start.get_day_of_week ();
+                    break;
+                case 3:
+                    day_to_add = 2 - start.get_day_of_week ();
+                    break;
+                case 4:
+                    day_to_add = 3 - start.get_day_of_week ();
+                    break;
+                case 5:
+                    day_to_add = 4 - start.get_day_of_week ();
+                    break;
+                case 6:
+                    day_to_add = 5 - start.get_day_of_week ();
+                    break;
+                default:
+                    day_to_add = 6 - start.get_day_of_week ();
+                    break;
+            }
+
+            if (start.add_days (day_to_add).get_month () < start.get_month ()) {
+                day_to_add = day_to_add + 7;
+            }
+
+            start = start.add_days (day_to_add);
+            end = end.add_days (day_to_add);
+
+            if (rrule.count > 0) {
+                for (int i = 1; i <= rrule.count; i++) {
+                    int n = i * rrule.interval * 7;
+
+                    if (view_range.contains (start.add_days (n)) || view_range.contains (end.add_days (n))) {
+                        dateranges.add (new Util.DateRange (start.add_days (n), end.add_days (n)));
+                    }
+                }
+            } else {
+                int i = 1;
+                int n = i * rrule.interval * 7;
+                bool is_null_time = rrule.until.is_null_time () == 1;
+                var temp_start = start.add_days (n);
+
+                while (view_range.last.compare (temp_start) > 0) {
+                    if (is_null_time == false) {
+                        if (temp_start.get_year () > rrule.until.year) {
+                            break;
+                        } else if (temp_start.get_year () == rrule.until.year) {
+                            if (temp_start.get_month () > rrule.until.month) {
+                                break;
+                            } else if (temp_start.get_month () == rrule.until.month && temp_start.get_day_of_month () > rrule.until.day) {
+                                break;
+                            }
+                        }
+                    }
+
+                    dateranges.add (new Util.DateRange (temp_start, end.add_days (n)));
+                    i++;
+                    n = i * rrule.interval * 7;
+                    temp_start = start.add_days (n);
+                }
+            }
+        }
+    }
+
+    public bool is_multiday_event (iCal.Component comp) {
+        var start = ical_to_date_time (comp.get_dtstart ());
+        var end = ical_to_date_time (comp.get_dtend ());
+        start = start.to_timezone (new TimeZone.utc ());
+        end = end.to_timezone (new TimeZone.utc ());
+
+        bool allday = is_the_all_day (start, end);
+
+        if (allday) {
+            end = end.add_days (-1);
+        }
+
+        if (start.get_year () != end.get_year () || start.get_day_of_year () != end.get_day_of_year ()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Say if an event lasts all day.
+     */
+    public bool is_the_all_day (GLib.DateTime dtstart, GLib.DateTime dtend) {
+        var UTC_start = dtstart.to_timezone (new TimeZone.utc ());
+        var timespan = dtend.difference (dtstart);
+
+        if (timespan % GLib.TimeSpan.DAY == 0 && UTC_start.get_hour () == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public GLib.DateTime get_date_from_ical_day (GLib.DateTime date, short day) {
+        int day_to_add = 0;
+
+        switch (iCal.RecurrenceType.day_day_of_week (day)) {
+            case iCal.RecurrenceTypeWeekday.SUNDAY:
+                day_to_add = 7 - date.get_day_of_week ();
+                break;
+            case iCal.RecurrenceTypeWeekday.MONDAY:
+                day_to_add = 1 - date.get_day_of_week ();
+                break;
+            case iCal.RecurrenceTypeWeekday.TUESDAY:
+                day_to_add = 2 - date.get_day_of_week ();
+                break;
+            case iCal.RecurrenceTypeWeekday.WEDNESDAY:
+                day_to_add = 3 - date.get_day_of_week ();
+                break;
+            case iCal.RecurrenceTypeWeekday.THURSDAY:
+                day_to_add = 4 - date.get_day_of_week ();
+                break;
+            case iCal.RecurrenceTypeWeekday.FRIDAY:
+                day_to_add = 5 - date.get_day_of_week ();
+                break;
+            default:
+                day_to_add = 6 - date.get_day_of_week ();
+                break;
+        }
+
+        if (date.add_days (day_to_add).get_month () < date.get_month ()) {
+            day_to_add = day_to_add + 7;
+        }
+
+        if (date.add_days (day_to_add).get_month () > date.get_month ()) {
+            day_to_add = day_to_add - 7;
+        }
+
+        switch (iCal.RecurrenceType.day_position (day)) {
+            case 1:
+                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add) / 7);
+
+                return date.add_days (day_to_add - n * 7);
+            case 2:
+                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 7) / 7);
+
+                return date.add_days (day_to_add - n * 7);
+            case 3:
+                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 14) / 7);
+
+                return date.add_days (day_to_add - n * 7);
+            case 4:
+                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 21) / 7);
+
+                return date.add_days (day_to_add - n * 7);
+            default:
+                int n = (int)GLib.Math.trunc ((date.get_day_of_month () + day_to_add - 28) / 7);
+
+                return date.add_days (day_to_add - n * 7);
+        }
+    }
+
+    /*
+     * Gee Utility Functions
+     */
+
+    /* Interleaves the values of two collections into a Map */
+    public void zip<F, G> (Gee.Iterable<F> iterable1, Gee.Iterable<G> iterable2, Gee.Map<F, G> map) {
+
+        var i1 = iterable1.iterator();
+        var i2 = iterable2.iterator();
+
+        while (i1.next() && i2.next())
+            map.set (i1, i2);
+    }
+
+    /* Constructs a new set with keys equal to the values of keymap */
+    public void remap<K, V> (Gee.Map<K, K> keymap, Gee.Map<K, V> valmap, ref Gee.Map<K, V> remap) {
+
+        foreach (K key in valmap) {
+
+            var k = keymap [key];
+            var v = valmap [key];
+
+            remap.set (k, v);
+        }
+    }
+
+    /* Computes hash value for string */
+    public uint string_hash_func (string key) {
+        return key.hash ();
+    }
+
+    /* Computes hash value for DateTime */
+    public uint datetime_hash_func (GLib.DateTime key) {
+        return key.hash ();
+    }
+
+    /* Computes hash value for E.CalComponent */
+    public uint calcomponent_hash_func (E.CalComponent key) {
+        unowned iCal.Component comp = key.get_icalcomponent ();
+        string uid = comp.get_uid ();
+        return uid.hash ();
+    }
+
+    /* Computes hash value for E.Source */
+    public uint source_hash_func (E.Source key) {
+        return key.dup_uid (). hash ();
+    }
+
+    /* Returns true if 'a' and 'b' are the same string */
+    public bool string_equal_func (string a, string b) {
+        return a == b;
+    }
+
+    /* Returns true if 'a' and 'b' are the same GLib.DateTime */
+    public bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) {
+        return a.equal (b);
+    }
+
+    /* Returns true if 'a' and 'b' are the same E.CalComponent */
+    public bool calcomponent_equal_func (E.CalComponent a, E.CalComponent b) {
+        unowned iCal.Component comp_a = a.get_icalcomponent ();
+        unowned iCal.Component comp_b = b.get_icalcomponent ();
+        return comp_a.get_uid () == comp_b.get_uid ();
+    }
+
+    /* Returns true if 'a' and 'b' are the same E.Source */
+    public bool source_equal_func (E.Source a, E.Source b) {
+        return a.dup_uid () == b.dup_uid ();
+    }
+
+    public async void reset_timer () {
+        has_scrolled = true;
+        Timeout.add (interval, () => {
+            has_scrolled = false;
+
+            return false;
+        });
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/calendar/WeekLabels.vala'
--- src/Widgets/calendar/WeekLabels.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/calendar/WeekLabels.vala	2016-02-03 23:24:26 +0000
@@ -0,0 +1,123 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2011-2015 Maya Developers (http://launchpad.net/maya)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Maxwell Barvian
+ *              Corentin Noël <[e-mail]>
+ */
+ namespace DateTime.Widgets {
+/**
+ * Represent the week labels at the left side of the grid.
+ */
+public class WeekLabels : Gtk.Revealer {
+
+    private Gtk.Grid day_grid;
+    private Gtk.Label[] labels;
+    private int nr_of_weeks;
+
+    public WeekLabels () {
+        vexpand = true;
+
+        day_grid = new Gtk.Grid ();
+        set_nr_of_weeks (5);
+        day_grid.insert_row (1);
+        day_grid.set_column_homogeneous (true);
+        day_grid.set_row_homogeneous (true);
+        day_grid.row_spacing = 0;
+        day_grid.show ();
+
+        var style_provider = Util.Css.get_css_provider ();
+
+        // EventBox properties
+        day_grid.get_style_context().add_provider (style_provider, 600);
+        day_grid.get_style_context().add_class ("weeks");
+
+        add (day_grid);
+    }
+
+    public void update (GLib.DateTime date, int nr_of_weeks) {
+
+        update_nr_of_labels (nr_of_weeks);
+
+        if (Services.SettingsManager.get_default ().show_weeks) {
+            no_show_all = false;
+            transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT;
+            set_reveal_child (true);
+
+            var next = date;
+            // Find the beginning of the week which is apparently always a monday
+            int days_to_add = (8 - next.get_day_of_week()) % 7;
+            next = next.add_days(days_to_add);
+            foreach (var label in labels) {
+                label.label = next.get_week_of_year ().to_string();
+                next = next.add_weeks (1);
+            }
+        } else {
+            transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT;
+            set_reveal_child (false);
+            no_show_all = true;
+            hide ();
+        }
+    }
+
+    public void set_nr_of_weeks (int new_number) {
+        day_grid.insert_row (new_number);
+        nr_of_weeks = new_number;
+    }
+
+    public int get_nr_of_weeks () {
+        return nr_of_weeks;
+    }
+
+    void update_nr_of_labels (int nr_of_weeks) {
+        // Destroy all the old ones
+
+        if (labels != null)
+            foreach (var label in labels)
+                label.destroy ();
+
+        // Create new labels
+        labels = new Gtk.Label[nr_of_weeks];
+        for (int c = 0; c < nr_of_weeks; c++) {
+            labels[c] = new Gtk.Label ("");
+            labels[c].valign = Gtk.Align.START;
+            labels[c].width_chars = 2;
+            labels[c].margin = 1;
+            day_grid.attach (labels[c], 0, c, 1, 1);
+            labels[c].show ();
+        }
+    }
+
+    public override bool draw (Cairo.Context cr) {
+        base.draw (cr);
+        if (!child_revealed)
+            return false;
+        Gtk.Allocation size;
+        get_allocation (out size);
+        cr.set_source_rgba (0.0, 0.0, 0.0, 0.25);
+        cr.set_line_width (1.0);
+        cr.set_antialias (Cairo.Antialias.NONE);
+        cr.move_to (size.width - 0.5, 0.5);
+        cr.line_to (size.width - 0.5, size.height);
+        for (int i = 1; i < size.height / 25; i++) {
+            cr.move_to (0, i * 25 + 0.5);
+            cr.line_to (size.width + 0.5, i * 25 + 0.5);
+        }
+        cr.stroke ();
+        return false;
+    }
+}
+}
\ No newline at end of file

=== added directory 'vapi'
=== added file 'vapi/libecalendar-1.2.deps'
--- vapi/libecalendar-1.2.deps	1970-01-01 00:00:00 +0000
+++ vapi/libecalendar-1.2.deps	2016-02-03 23:24:26 +0000
@@ -0,0 +1,3 @@
+libxml-2.0
+gio-2.0
+posix

=== added file 'vapi/libecalendar-1.2.metadata'
--- vapi/libecalendar-1.2.metadata	1970-01-01 00:00:00 +0000
+++ vapi/libecalendar-1.2.metadata	2016-02-03 23:24:26 +0000
@@ -0,0 +1,237 @@
+# NOTES:
+# ECalComponentAlarmTrigger.u is a union
+# ECalComponentPeriod.u is a union
+# Problematic enums: CalClientSourceTypeEnum CalModeEnum CalSetModeStatusEnum CalSourceTypeEnum DataCalMode
+
+#TODO:
+#- last sweep search for GLib.List and GLib.SList
+#- last sweep search for GLib.Cancellable
+
+#--- general fixes ---#
+
+E cprefix="E" lower_case_cprefix="e_" gir_version="1.2" gir_namespace="ECalendar"
+
+#--- sync with official vapi ---#
+
+ECal hidden="1" # deprecated@3.2
+ECalAuthFunc hidden="1" # depends on ECal
+
+ECalChange is_value_type="1" cheader_filename="libecal/e-cal-types.h"
+ECalChangeType cheader_filename="libecal/e-cal-types.h"
+
+ECalClient type_id="e_cal_client_get_type ()" cheader_filename="libecal/e-cal-client.h"
+
+e_cal_client_add_timezone async="1"
+
+e_cal_client_create_object async="1"
+e_cal_client_create_object.cancellable nullable="1"
+e_cal_client_create_object_finish.uid is_out="1" value_owned="1"
+
+e_cal_client_create_object_sync.uid is_out="1" transfer_ownership="1"
+e_cal_client_create_object_sync.cancellable nullable="1"
+
+e_cal_client_discard_alarm async="1"
+e_cal_client_discard_alarm.cancellable nullable="1"
+e_cal_client_discard_alarm_sync.cancellable nullable="1"
+
+e_cal_client_error_create transfer_ownership="1"
+
+e_cal_client_free_ecalcomp_slist.ecalcomps type_arguments="E.CalComponent"
+e_cal_client_free_icalcomp_slist.ecalcomps type_arguments="iCal.CalComponent"
+
+e_cal_client_generate_instances.cancellable nullable="1"
+e_cal_client_generate_instances.destroy_cb_data value_owned="1" nullable="1"
+e_cal_client_generate_instances_for_object.cancellable nullable="1"
+e_cal_client_generate_instances_for_object.destroy_cb_data value_owned="1" nullable="1"
+
+e_cal_client_get_attachment_uris async="1"
+e_cal_client_get_attachment_uris.cancellable nullable="1"
+e_cal_client_get_attachment_uris_finish.attachment_uris is_out="1" value_owned="1"
+e_cal_client_get_attachment_uris_sync.cancellable nullable="1"
+
+e_cal_client_get_default_object async="1"
+e_cal_client_get_default_object.cancellable nullable="1"
+e_cal_client_get_default_object_finish.icalcomp is_out="1" value_owned="1"
+e_cal_client_get_default_object_sync.cancellable nullable="1"
+
+e_cal_client_get_free_busy async="1"
+e_cal_client_get_free_busy.cancellable nullable="1"
+e_cal_client_get_free_busy_sync.cancellable nullable="1"
+
+e_cal_client_get_object async="1"
+e_cal_client_get_object.cancellable nullable="1"
+e_cal_client_get_object_finish.icalcomp is_out="1" value_owned="1"
+
+e_cal_client_get_object_list async="1"
+e_cal_client_get_object_list.cancellable nullable="1"
+e_cal_client_get_object_list_finish.icalcomps is_out="1" value_owned="1" type_arguments="iCal.icalcomponent"
+
+e_cal_client_get_object_list_as_comps async="1"
+e_cal_client_get_object_list_as_comps.cancellable nullable="1"
+e_cal_client_get_object_list_as_comps_finish.ecalcomps is_out="1" value_owned="1" type_arguments="E.CalComponent"
+e_cal_client_get_object_list_as_comps_sync.cancellable nullable="1"
+e_cal_client_get_object_list_as_comps_sync.ecalcomps is_out="1" value_owned="1" type_arguments="E.CalComponent"
+
+e_cal_client_get_object_list_sync.icalcomps is_out="1" value_owned="1" type_arguments="iCal.icalcomponent"
+e_cal_client_get_object_list_sync.cancellable nullable="1"
+
+e_cal_client_get_object_sync.icalcomp value_owned="1"
+e_cal_client_get_object_sync.cancellable nullable="1"
+
+e_cal_client_get_objects_for_uid async="1"
+e_cal_client_get_objects_for_uid.cancellable nullable="1"
+e_cal_client_get_objects_for_uid_finish.ecalcomps is_out="1" value_owned="1" type_arguments="E.CalComponent"
+e_cal_client_get_objects_for_uid_sync.ecalcomps is_out="1" value_owned="1" type_arguments="E.CalComponent"
+e_cal_client_get_objects_for_uid_sync.cancellable nullable="1"
+
+e_cal_client_get_sources.sources value_owned="1"
+
+e_cal_client_get_timezone async="1"
+e_cal_client_get_timezone.cancellable nullable="1"
+e_cal_client_get_timezone_finish.zone is_out="1" value_owned="1"
+e_cal_client_get_timezone_sync.cancellable nullable="1"
+e_cal_client_get_timezone_sync.zone is_out="1" value_owned="1"
+
+e_cal_client_get_view async="1"
+e_cal_client_get_view.cancellable nullable="1"
+e_cal_client_get_view_finish.view is_out="1" value_owned="1"
+e_cal_client_get_view_sync.cancellable nullable="1"
+e_cal_client_get_view_sync.view is_out="1" value_owned="1"
+
+e_cal_client_modify_object async="1"
+e_cal_client_modify_object.cancellable nullable="1"
+e_cal_client_modify_object_sync.cancellable nullable="1"
+
+e_cal_client_receive_objects async="1"
+e_cal_client_receive_objects.cancellable nullable="1"
+e_cal_client_receive_objects_sync.cancellable nullable="1"
+
+e_cal_client_remove_object async="1"
+e_cal_client_remove_object.cancellable nullable="1"
+e_cal_client_remove_object_sync.cancellable nullable="1"
+
+e_cal_client_send_objects async="1"
+e_cal_client_send_objects.cancellable nullable="1"
+e_cal_client_send_objects_finish.users is_out="1" value_owned="1" type_arguments="string"
+e_cal_client_send_objects_finish.modified_icalcomp is_out="1" value_owned="1"
+
+e_cal_client_send_objects_sync.cancellable nullable="1"
+e_cal_client_send_objects_sync.users is_out="1" value_owned="1" type_arguments="string"
+e_cal_client_send_objects_sync.modified_icalcomp is_out="1" value_owned="1"
+
+ECalClientError cheader_filename="libecal/e-cal-client.h"
+ECalClientSourceType cheader_filename="libecal/e-cal-client.h"
+ECalClientSourceTypeEnum cheader_filename="libecal/e-cal-client.h"
+
+ECalClientView cheader_filename="libecal/e-cal-client-view.h"
+ECalClientView:client owned_get="1" accessor_method="0"
+ECalClientView::objects_added.objects type_name="GLib.SList" type_arguments="unowned iCal.icalcomponent"
+ECalClientView::objects_modified.objects type_name="GLib.SList" type_arguments="unowned iCal.icalcomponent"
+ECalClientView::objects_removed.uids type_name="GLib.SList" type_arguments="unowned E.CalComponentId?"
+
+ECalComponent cheader_filename="libecal/e-cal-component.h"
+e_cal_component_gen_uid transfer_ownership="1"
+e_cal_component_get_alarm_uids transfer_ownership="1"
+e_cal_component_get_as_string transfer_ownership="1"
+e_cal_component_get_attachment_list.attachment_list is_out="1" value_owned="1"
+e_cal_component_get_attendee_list.attendee_list is_out="1" value_owned="1"
+e_cal_component_get_categories.categories is_out="1" value_owned="1"
+e_cal_component_get_categories_list.categ_list is_out="1" value_owned="1"
+e_cal_component_get_classification.classif is_out="1" value_owned="1"
+e_cal_component_get_comment_list.text_list is_out="1" value_owned="1"
+e_cal_component_get_completed.t is_out="1" type_name="iCal.icaltimetype" value_owned="1"
+e_cal_component_get_contact_list.text_list is_out="1" value_owned="1"
+e_cal_component_get_created.t is_out="1" type_name="iCal.icaltimetype" value_owned="1"
+e_cal_component_get_description_list.text_list is_out="1" value_owned="1"
+e_cal_component_get_dtend.dt is_out="1" value_owned="1"
+e_cal_component_get_dtstamp.t is_out="1" type_name="iCal.icaltimetype" value_owned="1"
+e_cal_component_get_dtstart.dt is_out="1" value_owned="1"
+e_cal_component_get_due.dt is_out="1" value_owned="1"
+e_cal_component_get_exdate_list.exdate_list is_out="1" value_owned="1"
+e_cal_component_get_exrule_list.recur_list is_out="1" value_owned="1"
+e_cal_component_get_exrule_property_list.recur_list is_out="1" value_owned="1"
+e_cal_component_get_geo.geo is_out="1" type_name="iCal.icalgeotype" value_owned="1"
+e_cal_component_get_icalcomponent transfer_ownership="0"
+e_cal_component_get_id transfer_ownership="1"
+e_cal_component_get_last_modified.t is_out="1" type_name="iCal.icaltimetype" value_owned="1"
+e_cal_component_get_location.location is_out="1" value_owned="1"
+e_cal_component_get_organizer.organizer is_out="1" value_owned="1"
+e_cal_component_get_percent.percent is_out="1" value_owned="1"
+e_cal_component_get_priority.priority is_out="1" value_owned="1"
+e_cal_component_get_rdate_list.period_list is_out="1" value_owned="1"
+e_cal_component_get_recurid.recur_id is_out="1" value_owned="1"
+e_cal_component_get_recurid_as_string transfer_ownership="1"
+e_cal_component_get_rrule_list.recur_list is_out="1" value_owned="1"
+e_cal_component_get_rrule_property_list.recur_list is_out="1" value_owned="1"
+e_cal_component_get_sequence.sequence is_out="1" value_owned="1"
+e_cal_component_get_status.status is_out="1" value_owned="1"
+e_cal_component_get_summary.summary is_out="1" value_owned="1"
+e_cal_component_get_transparency.transp is_out="1" value_owned="1"
+e_cal_component_get_uid.uid is_out="1" value_owned="1"
+e_cal_component_get_url.url is_out="1" value_owned="1"
+
+e_cal_component_set_completed.t type_name="iCal.icaltimetype"
+e_cal_component_set_created.t type_name="iCal.icaltimetype"
+e_cal_component_set_dtstamp.t type_name="iCal.icaltimetype"
+e_cal_component_set_geo.geo type_name="iCal.icalgeotype"
+e_cal_component_set_icalcomponent.icalcomp value_owned="1"
+e_cal_component_set_last_modified.t type_name="iCal.icaltimetype"
+
+ECalComponentAlarm cheader_filename="libecal/e-cal-component.h"
+e_cal_component_alarm_clone transfer_ownership="1"
+e_cal_component_alarm_get_action.action is_out="1" value_owned="1"
+e_cal_component_alarm_get_attach.attach is_out="1" value_owned="1"
+e_cal_component_alarm_get_attendee_list.attendee_list is_out="1" value_owned="1"
+e_cal_component_alarm_get_description.description is_out="1" value_owned="1"
+e_cal_component_alarm_get_icalcomponent transfer_ownership="1"
+
+ECalComponentAlarmAction cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarmInstance is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarmRepeat is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarmTrigger is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarmTriggerType cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarms is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentAlarms.alarms type_arguments="E.CalComponentAlarmInstance" cheader_filename="libecal/e-cal-component.h"
+ECalComponentAttendee is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentClassification cheader_filename="libecal/e-cal-component.h"
+
+ECalComponentDateTime cheader_filename="libecal/e-cal-component.h" is_value_type="1" has_destroy_function="0"
+ECalComponentDateTime.value type_name="iCal.icaltimetype*"
+
+ECalComponentField cheader_filename="libecal/e-cal-component.h"
+ECalComponentId is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentOrganizer is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentPeriod is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentPeriod.start type_name="iCal.icaltimetype" cheader_filename="libecal/e-cal-component.h"
+ECalComponentPeriodType cheader_filename="libecal/e-cal-component.h"
+ECalComponentRange is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentRangeType cheader_filename="libecal/e-cal-component.h"
+ECalComponentText is_value_type="1" cheader_filename="libecal/e-cal-component.h"
+ECalComponentTransparency cheader_filename="libecal/e-cal-component.h"
+ECalComponentVType cheader_filename="libecal/e-cal-component.h"
+
+CalObjInstance is_value_type="1" cheader_filename="libecal/e-cal-util.h"
+CalObjModType cheader_filename="libecal/e-cal-util.h"
+
+ECalLoadState cheader_filename="libecal/e-cal.h"
+CalMode cheader_filename="libecal/e-cal-util.h"
+ECalSetModeStatus cheader_filename="libecal/e-cal.h"
+ECalSourceType cheader_filename="libecal/e-cal.h"
+ECalendarStatus cheader_filename="libecal/e-cal-types.h"
+EDataCalMode cheader_filename="libecal/e-cal.h"
+ECalRecurInstanceFn cheader_filename="libecal/e-cal-recur.h"
+ECalRecurResolveTimezoneFn transfer_ownership="1" cheader_filename="libecal/e-cal-recur.h"
+
+CAL_BACKEND_PROPERTY* cheader_filename="libecal/e-cal-client.h"
+CAL_STATIC_CAPABILITY* cheader_filename="libecal/e-cal-util.h"
+
+ECalView hidden="1" # deprecated@3.2
+
+cal_obj_uid_list_free cheader_filename="libecal/e-cal-util.h"
+e_calendar_error_quark cheader_filename="libecal/e-cal-types.h"
+
+icaltimetype_to_tm* cheader_filename="libecal/e-cal-time-util.h"
+isodate_from_time_t cheader_filename="libecal/e-cal-time-util.h"
+tm_to_icaltimetype cheader_filename="libecal/e-cal-time-util.h"
+
+time_* cheader_filename="libecal/e-cal-time-util.h"

=== added file 'vapi/libecalendar-1.2.vapi'
--- vapi/libecalendar-1.2.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libecalendar-1.2.vapi	2016-02-03 23:24:26 +0000
@@ -0,0 +1,669 @@
+/* libecalendar-1.2.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "E", gir_namespace = "ECalendar", gir_version = "1.2", lower_case_cprefix = "e_")]
+namespace E {
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_cal_get_type ()")]
+	[Deprecated (since = "3.2")]
+	public class Cal : GLib.Object {
+		public virtual signal void backend_died ();
+		public virtual signal void backend_error (string message);
+		public virtual signal void cal_opened (int status);
+		public virtual signal void cal_opened_ex (long error);
+	}
+	namespace CalBackendProperty {
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS")]
+		public const string ALARM_EMAIL_ADDRESS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS")]
+		public const string CAL_EMAIL_ADDRESS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_BACKEND_PROPERTY_DEFAULT_OBJECT")]
+		public const string DEFAULT_OBJECT;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_cal_client_get_type ()")]
+	public class CalClient : E.Client {
+		[CCode (has_construct_function = false)]
+		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, 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 ();
+		public bool check_organizer_must_accept ();
+		public bool check_organizer_must_attend ();
+		public bool check_recurrences_no_master ();
+		public bool check_save_schedules ();
+		public static bool check_timezones (iCal.Component comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
+		public async bool create_object (iCal.Component icalcomp, GLib.Cancellable? cancellable, out string uid) throws GLib.Error;
+		public bool create_object_sync (iCal.Component icalcomp, out string uid, GLib.Cancellable? cancellable) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public CalClient.@default (E.CalClientSourceType source_type) throws GLib.Error;
+		public async bool discard_alarm (string uid, string rid, string auid, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool discard_alarm_sync (string uid, string rid, string auid, GLib.Cancellable? cancellable) throws GLib.Error;
+		public static void free_ecalcomp_slist (GLib.SList<E.CalComponent> ecalcomps);
+		public static void free_icalcomp_slist (GLib.SList<iCal.Component> icalcomps);
+		[CCode (has_construct_function = false)]
+		public CalClient.from_uri (string uri, E.CalClientSourceType source_type) throws GLib.Error;
+		public void generate_instances (ulong start, ulong end, GLib.Cancellable? cancellable, E.CalRecurInstanceFn cb, void* cb_data, owned GLib.DestroyNotify? destroy_cb_data);
+		public void generate_instances_for_object (iCal.Component icalcomp, ulong start, ulong end, GLib.Cancellable? cancellable, E.CalRecurInstanceFn cb, void* cb_data, owned GLib.DestroyNotify? destroy_cb_data);
+		public void generate_instances_for_object_sync (iCal.Component icalcomp, ulong start, ulong end, E.CalRecurInstanceFn cb, void* cb_data);
+		public void generate_instances_sync (ulong start, ulong end, E.CalRecurInstanceFn cb, void* cb_data);
+		public async bool get_attachment_uris (string uid, string rid, GLib.Cancellable? cancellable, out GLib.SList attachment_uris) throws GLib.Error;
+		public bool get_attachment_uris_sync (string uid, string rid, GLib.SList attachment_uris, GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned string get_component_as_string (iCal.Component icalcomp);
+		public async bool get_default_object (GLib.Cancellable? cancellable, out iCal.Component icalcomp) throws GLib.Error;
+		public bool get_default_object_sync (out unowned iCal.Component icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned iCal.TimeZone get_default_timezone ();
+		public async bool get_free_busy (ulong start, ulong end, GLib.SList users, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool get_free_busy_sync (ulong start, ulong end, GLib.SList users, GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned string get_local_attachment_store ();
+		public async bool get_object (string uid, string rid, GLib.Cancellable? cancellable, out iCal.Component icalcomp) throws GLib.Error;
+		public async bool get_object_list (string sexp, GLib.Cancellable? cancellable, out GLib.SList<iCal.Component> icalcomps) throws GLib.Error;
+		public async bool get_object_list_as_comps (string sexp, GLib.Cancellable? cancellable, out GLib.SList<E.CalComponent> ecalcomps) throws GLib.Error;
+		public bool get_object_list_as_comps_sync (string sexp, out GLib.SList<E.CalComponent> ecalcomps, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool get_object_list_sync (string sexp, out GLib.SList<iCal.Component> icalcomps, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool get_object_sync (string uid, string rid, out iCal.Component icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool get_objects_for_uid (string uid, GLib.Cancellable? cancellable, out GLib.SList<E.CalComponent> ecalcomps) throws GLib.Error;
+		public bool get_objects_for_uid_sync (string uid, out GLib.SList<E.CalComponent> ecalcomps, GLib.Cancellable? cancellable) throws GLib.Error;
+		public E.CalClientSourceType get_source_type ();
+		public async bool get_timezone (string tzid, GLib.Cancellable? cancellable, out iCal.TimeZone zone) throws GLib.Error;
+		public bool get_timezone_sync (string tzid, out iCal.TimeZone zone, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool get_view (string sexp, GLib.Cancellable? cancellable, out E.CalClientView view) throws GLib.Error;
+		public bool get_view_sync (string sexp, out E.CalClientView view, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool modify_object (iCal.Component icalcomp, E.CalObjModType mod, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool modify_object_sync (iCal.Component icalcomp, E.CalObjModType mod, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool receive_objects (iCal.Component icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool receive_objects_sync (iCal.Component icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool remove_object (string uid, string rid, E.CalObjModType mod, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool remove_object_sync (string uid, string rid, E.CalObjModType mod, GLib.Cancellable? cancellable) throws GLib.Error;
+		public static unowned iCal.TimeZone resolve_tzid_cb (string tzid, void* data);
+		public async bool send_objects (iCal.Component icalcomp, GLib.Cancellable? cancellable, out GLib.SList<string> users, out iCal.Component modified_icalcomp) throws GLib.Error;
+		public bool send_objects_sync (iCal.Component icalcomp, out GLib.SList<string> users, out iCal.Component modified_icalcomp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool set_default () throws GLib.Error;
+		public static bool set_default_source (E.Source source, E.CalClientSourceType source_type) throws GLib.Error;
+		public void set_default_timezone (iCal.TimeZone zone);
+		[CCode (has_construct_function = false)]
+		public CalClient.system (E.CalClientSourceType source_type) throws GLib.Error;
+		public static unowned iCal.TimeZone tzlookup (string tzid, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
+		public static unowned iCal.TimeZone tzlookup_icomp (string tzid, void* custom, GLib.Cancellable cancellable) throws GLib.Error;
+		public virtual signal void free_busy_data (void* free_busy_ecalcomps);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_cal_client_view_get_type ()")]
+	public class CalClientView : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected CalClientView ();
+		public bool is_running ();
+		public void set_fields_of_interest (GLib.SList<string>? fields_of_interest) throws GLib.Error;
+		public void set_flags (E.CalClientViewFlags flags) throws GLib.Error;
+		public void start () throws GLib.Error;
+		public void stop () throws GLib.Error;
+		public E.CalClient client { get; construct; }
+		[NoAccessorMethod]
+		public void* view { get; construct; }
+		public virtual signal void complete (GLib.Error error);
+		public virtual signal void objects_added (GLib.SList<weak iCal.Component> objects);
+		public virtual signal void objects_modified (GLib.SList<weak iCal.Component> objects);
+		public virtual signal void objects_removed (GLib.SList<weak E.CalComponentId?> uids);
+		public virtual signal void progress (uint percent, string message);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_cal_component_get_type ()")]
+	public class CalComponent : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public CalComponent ();
+		[CCode (has_construct_function = false)]
+		public CalComponent.from_string (string calobj);
+		[CCode (has_construct_function = false)]
+		public CalComponent.from_icalcomponent (iCal.Component icalcomp);
+		public void abort_sequence ();
+		public void add_alarm (E.CalComponentAlarm alarm);
+		public unowned E.CalComponent clone ();
+		public void commit_sequence ();
+		public bool event_dates_match (E.CalComponent comp2);
+		public static void free_attendee_list (GLib.SList<E.CalComponentAttendee> attendee_list);
+		public static void free_categories_list (GLib.SList<string> categ_list);
+		public static void free_datetime (E.CalComponentDateTime dt);
+		public static void free_exdate_list (GLib.SList exdate_list);
+		public static void free_geo (iCal.GeoType geo);
+		public static void free_icaltimetype (iCal.TimeType t);
+		public static void free_id (E.CalComponentId id);
+		public static void free_percent (int percent);
+		public static void free_period_list (GLib.SList period_list);
+		public static void free_priority (int priority);
+		public static void free_range (E.CalComponentRange range);
+		public static void free_recur_list (GLib.SList<E.CalComponentRange> recur_list);
+		public static void free_sequence (int sequence);
+		public static void free_text_list (GLib.SList<E.CalComponentText> text_list);
+		public static string gen_uid ();
+		public E.CalComponentAlarm get_alarm (string auid);
+		public GLib.List<string> get_alarm_uids ();
+		public string get_as_string ();
+		public void get_attachment_list (out GLib.SList<string> attachment_list);
+		public void get_attendee_list (out GLib.SList<E.CalComponentAttendee?> attendee_list);
+		public void get_categories (out string categories);
+		public void get_categories_list (out GLib.SList<string> categ_list);
+		public void get_classification (out E.CalComponentClassification classif);
+		public void get_comment_list (out GLib.SList<E.CalComponentText> text_list);
+		public void get_completed (out iCal.TimeType t);
+		public void get_contact_list (out GLib.SList<E.CalComponentText> text_list);
+		public void get_created (out iCal.TimeType t);
+		public void get_description_list (out GLib.SList<E.CalComponentText> text_list);
+		public void get_dtend (out E.CalComponentDateTime dt);
+		public void get_dtstamp (out iCal.TimeType t);
+		public void get_dtstart (out E.CalComponentDateTime dt);
+		public void get_due (out E.CalComponentDateTime dt);
+		public void get_exdate_list (out GLib.SList<E.CalComponentDateTime> exdate_list);
+		public void get_exrule_list (out GLib.SList<E.CalComponentRange> recur_list);
+		public void get_exrule_property_list (out GLib.SList<E.CalComponentRange> recur_list);
+		public void get_geo (out iCal.GeoType geo);
+		public unowned iCal.Component get_icalcomponent ();
+		public E.CalComponentId get_id ();
+		public void get_last_modified (out iCal.TimeType t);
+		public void get_location (out string location);
+		public int get_num_attachments ();
+		public void get_organizer (out E.CalComponentOrganizer organizer);
+		public void get_percent (out int percent);
+		public int get_percent_as_int ();
+		public void get_priority (out int priority);
+		public void get_rdate_list (out GLib.SList<E.CalComponentPeriod> period_list);
+		public void get_recurid (out E.CalComponentRange recur_id);
+		public string get_recurid_as_string ();
+		public void get_rrule_list (out GLib.SList<E.CalComponentRange> recur_list);
+		public void get_rrule_property_list (out GLib.SList<E.CalComponentRange> recur_list);
+		public void get_sequence (out int sequence);
+		public void get_status (out iCal.PropertyStatus status);
+		public void get_summary (out E.CalComponentText summary);
+		public void get_transparency (out E.CalComponentTransparency transp);
+		public void get_uid (out string uid);
+		public void get_url (out string url);
+		public E.CalComponentVType get_vtype ();
+		public bool has_alarms ();
+		public bool has_attachments ();
+		public bool has_attendees ();
+		public bool has_exceptions ();
+		public bool has_exdates ();
+		public bool has_exrules ();
+		public bool has_organizer ();
+		public bool has_rdates ();
+		public bool has_recurrences ();
+		public bool has_rrules ();
+		public bool has_simple_recurrence ();
+		public bool is_instance ();
+		public void remove_alarm (string auid);
+		public void remove_all_alarms ();
+		public void rescan ();
+		public void set_attachment_list (GLib.SList<string> attachment_list);
+		public void set_attendee_list (GLib.SList<E.CalComponentAttendee> attendee_list);
+		public void set_categories (string categories);
+		public void set_categories_list (GLib.SList<string> categ_list);
+		public void set_classification (E.CalComponentClassification classif);
+		public void set_comment_list (GLib.SList<E.CalComponentText> text_list);
+		public void set_completed (iCal.TimeType t);
+		public void set_contact_list (GLib.SList<E.CalComponentText> text_list);
+		public void set_created (iCal.TimeType t);
+		public void set_description_list (GLib.SList<E.CalComponentText> text_list);
+		public void set_dtend (E.CalComponentDateTime dt);
+		public void set_dtstamp (iCal.TimeType t);
+		public void set_dtstart (E.CalComponentDateTime dt);
+		public void set_due (E.CalComponentDateTime dt);
+		public void set_exdate_list (GLib.SList exdate_list);
+		public void set_exrule_list (GLib.SList<E.CalComponentRange> recur_list);
+		public void set_geo (iCal.GeoType* geo);
+		public bool set_icalcomponent (owned iCal.Component icalcomp);
+		public void set_last_modified (iCal.TimeType t);
+		public void set_location (string location);
+		public void set_new_vtype (E.CalComponentVType type);
+		public void set_organizer (E.CalComponentOrganizer organizer);
+		public void set_percent (int percent);
+		public void set_percent_as_int (int percent);
+		public void set_priority (int priority);
+		public void set_rdate_list (GLib.SList<E.CalComponentPeriod> period_list);
+		public void set_recurid (E.CalComponentRange recur_id);
+		public void set_rrule_list (GLib.SList<E.CalComponentRange> recur_list);
+		public void set_sequence (int sequence);
+		public void set_status (iCal.PropertyStatus status);
+		public void set_summary (E.CalComponentText summary);
+		public void set_transparency (E.CalComponentTransparency transp);
+		public void set_uid (string uid);
+		public void set_url (string url);
+		public void strip_errors ();
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", free_function = "e_cal_component_alarm_free")]
+	[Compact]
+	public class CalComponentAlarm {
+		[CCode (has_construct_function = false)]
+		public CalComponentAlarm ();
+		public E.CalComponentAlarm clone ();
+		public void get_action (out E.CalComponentAlarmAction action);
+		public void get_attach (out iCal.Attach attach);
+		public void get_attendee_list (out GLib.SList<E.CalComponentAttendee> attendee_list);
+		public void get_description (out E.CalComponentText description);
+		public iCal.Component get_icalcomponent ();
+		public void get_repeat (out E.CalComponentAlarmRepeat repeat);
+		public void get_trigger (out E.CalComponentAlarmTrigger trigger);
+		public unowned string get_uid ();
+		public bool has_attendees ();
+		public void set_action (E.CalComponentAlarmAction action);
+		public void set_attach (iCal.Attach attach);
+		public void set_attendee_list (GLib.SList<E.CalComponentAttendee> attendee_list);
+		public void set_description (E.CalComponentText description);
+		public void set_repeat (E.CalComponentAlarmRepeat repeat);
+		public void set_trigger (E.CalComponentAlarmTrigger trigger);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalChange {
+		public weak E.CalComponent comp;
+		public E.CalChangeType type;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_cal_view_get_type ()")]
+	[Deprecated (since = "3.2")]
+	public class CalView : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected CalView ();
+		[Deprecated (since = "3.2")]
+		public void start ();
+		[Deprecated (since = "3.2")]
+		public void stop ();
+		[NoAccessorMethod]
+		public E.Cal client { owned get; construct; }
+		[NoAccessorMethod]
+		public void* view { get; construct; }
+		public signal void objects_added (GLib.List<long> objects);
+		public signal void objects_modified (GLib.List<long> objects);
+		public signal void objects_removed (GLib.List<E.CalComponentId> objects);
+		public virtual signal void view_complete (uint status, string error_msg);
+		public virtual signal void view_done (int status);
+		public virtual signal void view_progress (string message, uint percent);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentAlarmInstance {
+		public weak string auid;
+		public time_t trigger;
+		public time_t occur_start;
+		public time_t occur_end;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentAlarmRepeat {
+		public int repetitions;
+		public iCal.DurationType duration;
+	}
+	[SimpleType]
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentAlarmTrigger {
+		public E.CalComponentAlarmTriggerType type;
+		[CCode(cname = "u.rel_duration")]
+		public iCal.DurationType rel_duration;
+		[CCode(cname = "u.abs_time")]
+		public iCal.TimeType abs_time;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", free_function = "e_cal_component_alarms_free")]
+	public struct CalComponentAlarms {
+		public weak E.CalComponent comp;
+		[CCode (cheader_filename = "libecal/libecal.h")]
+		public weak GLib.SList<E.CalComponentAlarmInstance> alarms;
+		public void free ();
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", has_type_id = false)]
+	public struct CalComponentAttendee {
+		public weak string value;
+		public weak string member;
+		public iCal.ParameterCutype cutype;
+		public iCal.ParameterRole role;
+		public iCal.ParameterPartStat status;
+		public bool rsvp;
+		public weak string delto;
+		public weak string delfrom;
+		public weak string sentby;
+		public weak string cn;
+		public weak string language;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", free_function = "e_cal_component_free_datetime")]
+	public struct CalComponentDateTime {
+		public iCal.TimeType* value;
+		public weak string tzid;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", free_function = "e_cal_component_free_id", copy_function = "e_cal_component_id_copy")]
+	public struct CalComponentId {
+		public weak string uid;
+		public weak string rid;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentOrganizer {
+		public weak string value;
+		public weak string sentby;
+		public weak string cn;
+		public weak string language;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentPeriod {
+		public E.CalComponentPeriodType type;
+		[CCode (cheader_filename = "libecal/libecal.h")]
+		public iCal.TimeType start;
+		[CCode(cname = "u.duration")]
+		public iCal.DurationType duration;
+		[CCode(cname = "u.end")]
+		public iCal.TimeType end;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", free_function = "e_cal_component_free_range")]
+	public struct CalComponentRange {
+		public E.CalComponentRangeType type;
+		public E.CalComponentDateTime datetime;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalComponentText {
+		public weak string value;
+		public weak string altrep;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public struct CalObjInstance {
+		public weak string uid;
+		public ulong start;
+		public ulong end;
+		[CCode (cname = "cal_obj_instance_list_free")]
+		public static void list_free (GLib.List list);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", type_id = "e_timezone_cache_get_type")]
+	public interface TimezoneCache {
+		public void add_timezone (iCal.TimeZone zone);
+		public iCal.TimeZone get_timezone (string tzid);
+		public GLib.List<iCal.TimeZone> list_timezones ();
+		public signal void timezone_added (iCal.TimeZone zone);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CHANGE_", type_id = "e_cal_change_type_get_type ()")]
+	public enum CalChangeType {
+		ADDED,
+		MODIFIED,
+		DELETED
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_ERROR_")]
+	public errordomain CalClientError {
+		NO_SUCH_CALENDAR,
+		OBJECT_NOT_FOUND,
+		INVALID_OBJECT,
+		UNKNOWN_USER,
+		OBJECT_ID_ALREADY_EXISTS,
+		INVALID_RANGE;
+		public static GLib.Error create (E.CalClientError code, string custom_msg);
+		public static GLib.Quark quark ();
+		public static unowned string to_string (E.CalClientError code);
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_SOURCE_TYPE_", type_id = "e_cal_client_source_type_get_type ()")]
+	public enum CalClientSourceType {
+		EVENTS,
+		TASKS,
+		MEMOS,
+		LAST
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_ALARM_", has_type_id = false)]
+	public enum CalComponentAlarmAction {
+		NONE,
+		AUDIO,
+		DISPLAY,
+		EMAIL,
+		PROCEDURE,
+		UNKNOWN
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_CLIENT_VIEW_FLAGS_")]
+	[Flags]
+	public enum CalClientViewFlags {
+		NONE,
+		NOTIFY_INITIAL
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_ALARM_TRIGGER_", has_type_id = false)]
+	public enum CalComponentAlarmTriggerType {
+		NONE,
+		RELATIVE_START,
+		RELATIVE_END,
+		ABSOLUTE
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_CLASS_", has_type_id = false)]
+	public enum CalComponentClassification {
+		NONE,
+		PUBLIC,
+		PRIVATE,
+		CONFIDENTIAL,
+		UNKNOWN
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_FIELD_", has_type_id = false)]
+	public enum CalComponentField {
+		CATEGORIES,
+		CLASSIFICATION,
+		COMPLETED,
+		DTEND,
+		DTSTART,
+		DUE,
+		GEO,
+		PERCENT,
+		PRIORITY,
+		SUMMARY,
+		TRANSPARENCY,
+		URL,
+		HAS_ALARMS,
+		ICON,
+		COMPLETE,
+		RECURRING,
+		OVERDUE,
+		COLOR,
+		STATUS,
+		COMPONENT,
+		LOCATION,
+		NUM_FIELDS
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_PERIOD_", has_type_id = false)]
+	public enum CalComponentPeriodType {
+		DATETIME,
+		DURATION
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_RANGE_", has_type_id = false)]
+	public enum CalComponentRangeType {
+		SINGLE,
+		THISPRIOR,
+		THISFUTURE
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_TRANSP_", has_type_id = false)]
+	public enum CalComponentTransparency {
+		NONE,
+		TRANSPARENT,
+		OPAQUE,
+		UNKNOWN
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_COMPONENT_", has_type_id = false)]
+	public enum CalComponentVType {
+		NO_TYPE,
+		EVENT,
+		TODO,
+		JOURNAL,
+		FREEBUSY,
+		TIMEZONE
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_LOAD_", has_type_id = false)]
+	public enum CalLoadState {
+		NOT_LOADED,
+		AUTHENTICATING,
+		LOADING,
+		LOADED
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "CAL_MODE_", has_type_id = false)]
+	public enum CalMode {
+		INVALID,
+		LOCAL,
+		REMOTE,
+		ANY
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cname="CalObjModType", cprefix = "E_CAL_OBJ_MOD_", has_type_id = false)]
+	[Flags]
+	public enum CalObjModType {
+		THIS,
+		THIS_AND_PRIOR,
+		THIS_AND_FUTURE,
+		ONLY_THIS,
+		ALL
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_SET_MODE_", has_type_id = false)]
+	public enum CalSetModeStatus {
+		SUCCESS,
+		ERROR,
+		NOT_SUPPORTED
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CAL_SOURCE_TYPE_", has_type_id = false)]
+	public enum CalSourceType {
+		EVENT,
+		TODO,
+		JOURNAL,
+		LAST
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "E_CALENDAR_STATUS_", type_id = "e_calendar_status_get_type ()")]
+	public enum CalendarStatus {
+		OK,
+		INVALID_ARG,
+		BUSY,
+		REPOSITORY_OFFLINE,
+		NO_SUCH_CALENDAR,
+		OBJECT_NOT_FOUND,
+		INVALID_OBJECT,
+		URI_NOT_LOADED,
+		URI_ALREADY_LOADED,
+		PERMISSION_DENIED,
+		UNKNOWN_USER,
+		OBJECT_ID_ALREADY_EXISTS,
+		PROTOCOL_NOT_SUPPORTED,
+		CANCELLED,
+		COULD_NOT_CANCEL,
+		AUTHENTICATION_FAILED,
+		AUTHENTICATION_REQUIRED,
+		DBUS_EXCEPTION,
+		OTHER_ERROR,
+		INVALID_SERVER_VERSION,
+		NOT_SUPPORTED
+	}
+	namespace CalStaticCapability {
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_CREATE_MESSAGES")]
+		public const string CREATE_MESSAGES;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED")]
+		public const string DELEGATE_SUPPORTED;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY")]
+		public const string DELEGATE_TO_MANY;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING")]
+		public const string HAS_UNACCEPTED_MEETING;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT")]
+		public const string NO_ALARM_REPEAT;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS")]
+		public const string NO_AUDIO_ALARMS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK")]
+		public const string NO_CONV_TO_ASSIGN_TASK;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR")]
+		public const string NO_CONV_TO_RECUR;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS")]
+		public const string NO_DISPLAY_ALARMS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS")]
+		public const string NO_EMAIL_ALARMS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS")]
+		public const string NO_GEN_OPTIONS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_ORGANIZER")]
+		public const string NO_ORGANIZER;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS")]
+		public const string NO_PROCEDURE_ALARMS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT")]
+		public const string NO_TASK_ASSIGNMENT;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_THISANDFUTURE")]
+		public const string NO_THISANDFUTURE;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_THISANDPRIOR")]
+		public const string NO_THISANDPRIOR;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_NO_TRANSPARENCY")]
+		public const string NO_TRANSPARENCY;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY")]
+		public const string ONE_ALARM_ONLY;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ACCEPT")]
+		public const string ORGANIZER_MUST_ACCEPT;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND")]
+		public const string ORGANIZER_MUST_ATTEND;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS")]
+		public const string ORGANIZER_NOT_EMAIL_ADDRESS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER")]
+		public const string RECURRENCES_NO_MASTER;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED")]
+		public const string REFRESH_SUPPORTED;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_REMOVE_ALARMS")]
+		public const string REMOVE_ALARMS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS")]
+		public const string REMOVE_ONLY_THIS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS")]
+		public const string REQ_SEND_OPTIONS;
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "CAL_STATIC_CAPABILITY_SAVE_SCHEDULES")]
+		public const string SAVE_SCHEDULES;
+	}
+	[CCode (cheader_filename = "libecal/libecal.h", cprefix = "", has_type_id = false)]
+	public enum DataCalMode {
+		Local,
+		Remote,
+		AnyMode
+	}
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public delegate bool CalRecurInstanceFn (E.CalComponent comp, ulong instance_start, ulong instance_end);
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public delegate iCal.TimeZone CalRecurResolveTimezoneFn (string tzid);
+	[CCode (cheader_filename = "libecal/libecal.h")]
+	public delegate iCal.TimeZone TzLookup (string tzid, E.CalClient ecalclient, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "libecal/libecal.h", cname = "cal_obj_uid_list_free")]
+	public static void cal_obj_uid_list_free (GLib.List list);
+	public static string cal_system_timezone_get_location ();
+	namespace Util {
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "icaltimetype_to_tm")]
+		public static Posix.tm icaltimetype_to_tm (iCal.TimeType itt);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "icaltimetype_to_tm_with_zone")]
+		public static Posix.tm icaltimetype_to_tm_with_zone (iCal.TimeType itt, iCal.TimeZone from_zone, iCal.TimeZone to_zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "isodate_from_time_t")]
+		public static unowned string isodate_from_time_t (time_t t);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_add_day")]
+		public static time_t time_add_day (time_t time, int days);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_add_day_with_zone")]
+		public static time_t time_add_day_with_zone (time_t time, int days, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_add_month_with_zone")]
+		public static time_t time_add_month_with_zone (time_t time, int months, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_add_week")]
+		public static time_t time_add_week (time_t time, int weeks);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_add_week_with_zone")]
+		public static time_t time_add_week_with_zone (time_t time, int weeks, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_begin")]
+		public static time_t time_day_begin (time_t t);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_begin_with_zone")]
+		public static time_t time_day_begin_with_zone (time_t time, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_end")]
+		public static time_t time_day_end (time_t t);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_end_with_zone")]
+		public static time_t time_day_end_with_zone (time_t time, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_of_week")]
+		public static int time_day_of_week (int day, int month, int year);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_day_of_year")]
+		public static int time_day_of_year (int day, int month, int year);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_days_in_month")]
+		public static int time_days_in_month (int year, int month);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_from_isodate")]
+		public static time_t time_from_isodate (string str);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_is_leap_year")]
+		public static bool time_is_leap_year (int year);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_leap_years_up_to")]
+		public static int time_leap_years_up_to (int year);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_month_begin_with_zone")]
+		public static time_t time_month_begin_with_zone (time_t time, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_to_gdate_with_zone")]
+		public static void time_to_gdate_with_zone (GLib.Date date, time_t time, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_week_begin_with_zone")]
+		public static time_t time_week_begin_with_zone (time_t time, int week_start_day, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "time_year_begin_with_zone")]
+		public static time_t time_year_begin_with_zone (time_t time, iCal.TimeZone zone);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "tm_to_icaltimetype")]
+		public static iCal.TimeType tm_to_icaltimetype (Posix.tm time, bool is_date);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_get_system_timezone_location")]
+		public static string get_system_timezone_location ();
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_priority_from_string")]
+		public static int priority_from_string (string string);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_priority_to_string")]
+		public static unowned string priority_to_string (int priority);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_new_component")]
+		public static iCal.Component new_component (iCal.ComponentKind kind);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_parse_ics_string")]
+		public static iCal.Component parse_ics_string (string string);
+		[CCode (cheader_filename = "libecal/libecal.h", cname = "e_cal_util_parse_ics_file")]
+		public static iCal.Component parse_ics_file (string filename);
+		public static bool cal_client_check_timezones (iCal.Component comp, GLib.List<iCal.Component> comps, TzLookup tzlookup, E.CalClient ecalclient, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	}
+}

=== added file 'vapi/libedataserver-1.2.metadata'
--- vapi/libedataserver-1.2.metadata	1970-01-01 00:00:00 +0000
+++ vapi/libedataserver-1.2.metadata	2016-02-03 23:24:26 +0000
@@ -0,0 +1,176 @@
+#--- general fixes ---#
+
+E cprefix="E" lower_case_cprefix="e_" gir_version="1.2" gir_namespace="EDataServer"
+e_sexp_error cname="get_error" # see patch_gi()
+
+EList.iterators hidden="1" # private
+EList.list hidden="1" # private
+EList.copy hidden="1" # private
+EList.free hidden="1" # private
+EList.closure hidden="1" # private
+EListIterator.iterator hidden="1" # private
+
+#--- things to match the official vapi ---#
+
+EAccount cheader_filename="libedataserver/e-account.h" type_id="e_account_get_type ()"
+
+EAccountList cheader_filename="libedataserver/e-account-list.h"
+
+EAccountIdentity is_value_type="1" cheader_filename="libedataserver/e-account.h"
+
+EAccountReceiptPolicy cheader_filename="libedataserver/e-account.h"
+
+EAccountService is_value_type="1" cheader_filename="libedataserver/e-account.h"
+
+e_account_access_t cheader_filename="libedataserver/e-account.h"
+e_account_find_t cheader_filename="libedataserver/e-account.h"
+e_account_item_t cheader_filename="libedataserver/e-account.h"
+e_account_list_new hidden="1"
+e_account_list_construct hidden="1"
+
+e_categories* cheader_filename="libedataserver/e-categories.h"
+
+EClient abstract="1" cheader_filename="libedataserver/e-client.h" type_id="e_client_get_type ()"
+e_client_error_create transfer_ownership="1"
+
+e_client_get_backend_property async="1"
+e_client_get_backend_property.cancellable nullable="1"
+e_client_get_backend_property_finish
+e_client_get_backend_property_finish.prop_value is_out="1" value_owned="1"
+
+e_client_get_backend_property_sync.prop_value is_out="1" value_owned="1"
+e_client_get_backend_property_sync.cancellable nullable="1"
+e_client_get_capabilities type_arguments="string"
+e_client_open async="1"
+e_client_open.cancellable nullable="1"
+e_client_open_sync.cancellable nullable="1"
+e_client_refresh async="1"
+e_client_refresh.cancellable nullable="1"
+e_client_refresh_sync.cancellable nullable="1"
+e_client_remove async="1"
+e_client_remove.cancellable nullable="1"
+e_client_remove_sync.cancellable nullable="1"
+e_client_retrieve_capabilities async="1"
+e_client_retrieve_capabilities.cancellable nullable="1"
+e_client_retrieve_capabilities_finish.capabilities is_out="1" value_owned="1"
+e_client_retrieve_capabilities_sync.capabilities is_out="1" value_owned="1"
+e_client_retrieve_capabilities_sync.cancellable nullable="1"
+e_client_set_backend_property async="1"
+e_client_set_backend_property.cancellable nullable="1"
+e_client_set_backend_property_sync.cancellable nullable="1"
+e_client_util_unwrap_dbus_error errordomain="1"
+
+CLIENT_BACKEND* cheader_filename="libedataserver/e-client.h"
+
+EClientError cheader_filename="libedataserver/e-client.h"
+EClientErrorsList is_value_type="1" cheader_filename="libedataserver/e-client.h"
+
+ECredentials is_value_type="1" free_function="e_credentials_free" cheader_filename="libedataserver/e-credentials.h"
+ECredentials.priv hidden="1" type="bool"
+e_credentials_get transfer_ownership="1"
+e_credentials_util_prompt_flags_to_string transfer_ownership="1"
+ECredentialsPromptFlags cheader_filename="libedataserver/e-credentials.h"
+
+E_CREDENTIALS_KEY* cheader_filename="libedataserver/e-credentials.h"
+
+e_data_server_util* cheader_filename="libedataserver/e-data-server-utils.h"
+
+E_DEBUG_LOG* cheader_filename="libedataserver/e-debug-log.h"
+
+EDS_* cheader_filename="libedataserver/eds-version.h"
+
+EFlag cheader_filename="libedataserver/e-flag.h"
+
+e_debug_log* cheader_filename="libedataserver/e-debug-log.h"
+
+e_filename_make_safe cheader_filename="libedataserver/e-data-server-util.h"
+
+e_get_user* cheader_filename="libedataserver/e-data-server-util.h"
+
+eds_check_version cheader_filename="libedataserver/eds-version.h"
+
+EIterator type_id="e_iterator_get_type ()" cheader_filename="libedataserver/e-iterator.h" 
+EIterator::invalidate has_emitter="1"
+
+EList* cheader_filename="libedataserver/e-list.h" type_id="e_list_get_type ()"
+e_list_new hidden="1"
+e_list_construct hidden="1"
+e_list_duplicate transfer_ownership="1"
+
+e_localtime_with_offset cheader_filename="libedataserver/e-time-utils.h" 
+e_mktime_utc cheader_filename="libedataserver/e-time-utils.h" 
+
+EListIterator type_id="e_list_iterator_get_type ()" cheader_filename="libedataserver/e-list-iterator.h" 
+
+EMemChunk cheader_filename="libedataserver/e-memory.h" 
+
+EOperationPool cheader_filename="libedataserver/e-operation-pool.h" 
+
+e_pointer_tracker* cheader_filename="libedataserver/e-data-server-util.h" 
+e_*strftime cheader_filename="libedataserver/e-data-server-util.h" 
+
+EProxy type_id="e_proxy_get_type ()" cheader_filename="libedataserver/e-proxy.h" 
+
+ESExp* cheader_filename="libedataserver/e-sexp.h" 
+ESExp.term_chunks type_name="E.MemChunk"
+ESExp.result_chunks type_name="E.MemChunk"
+E_TYPE_SEXP cheader_filename="libedataserver/e-sexp.h" 
+
+ESource type_id="e_source_get_type ()" cheader_filename="libedataserver/e-source.h" 
+e_source_build_absolute_uri transfer_ownership="1"
+e_source_copy transfer_ownership="1"
+e_source_get_duped_property transfer_ownership="1"
+e_source_get_uri transfer_ownership="1"
+e_source_set_property.property_value nullable="1"
+e_source_to_standalone_xml transfer_ownership="1"
+e_source_get_property transfer_ownership="1"
+e_source_uid_from_xml_node transfer_ownership="1"
+
+ESourceGroup type_id="e_source_group_get_type ()" cheader_filename="libedataserver/e-source-group.h" 
+ESourceGroup::source_added.source type_name="E.Source"
+ESourceGroup::source_removed.source type_name="E.Source"
+
+e_source_group_get_property transfer_ownership="1"
+e_source_group_peek_sources type_arguments="E.Source"
+e_source_group_to_xml transfer_ownership="1"
+e_source_group_uid_from_xmldoc transfer_ownership="1"
+
+ESourceList type_id="e_source_list_get_type ()" cheader_filename="libedataserver/e-source-list.h" 
+e_source_list_ensure_group transfer_ownership="1"
+e_source_list_peek_default_source nullable="1"
+e_source_list_peek_groups type_arguments="E.SourceGroup"
+
+e_time_format* cheader_filename="libedataserver/e-time-utils.h" 
+e_time_get_d_fmt_with_4digit_year cheader_filename="libedataserver/e-time-utils.h" transfer_ownership="1"
+e_time_parse_date* cheader_filename="libedataserver/e-time-utils.h" 
+e_time_parse_time cheader_filename="libedataserver/e-time-utils.h" 
+
+ETimeParse* cheader_filename="libedataserver/e-time-utils.h" 
+
+EUri is_value_type="1" cheader_filename="libedataserver/e-url.h" 
+EUri.params type_name="GLib.Datalist"
+e_uri_to_string transfer_ownership="1"
+
+e_uid_new transfer_ownership="1" cheader_filename="libedataserver/e-uid.h" 
+
+e_url_equal cheader_filename="libedataserver/e-url.h" 
+e_url_shroud transfer_ownership="1" cheader_filename="libedataserver/e-url.h" 
+
+e_util_strstrcase transfer_ownership="1" cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_unicode_get_utf8 transfer_ownership="1" cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_utf8_make_valid transfer_ownership="1" cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_utf8_remove_accents transfer_ownership="1" cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_ensure_gdbus_string cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_gthread_id cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_utf8_strcasecmp cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_utf8_strstrcase cheader_filename="libedataserver/e-data-server-util.h" 
+e_util_utf8_strstrcasedecomp cheader_filename="libedataserver/e-data-server-util.h" 
+
+EXmlHash* cheader_filename="libedataserver/e-xml-hash-utils.h" 
+e_xml_to_hash transfer_ownership="1" cheader_filename="libedataserver/e-xml-hash-utils.h" 
+e_xml_destroy_hash cheader_filename="libedataserver/e-xml-hash-utils.h" 
+e_xml_from_hash cheader_filename="libedataserver/e-xml-hash-utils.h" 
+
+e_xml_get_child_by_name cheader_filename="libedataserver/e-xml-utils.h" 
+e_xml_parse_file cheader_filename="libedataserver/e-xml-utils.h" 
+e_xml_save_file cheader_filename="libedataserver/e-xml-utils.h" 

=== added file 'vapi/libedataserver-1.2.vapi'
--- vapi/libedataserver-1.2.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libedataserver-1.2.vapi	2016-02-03 23:24:26 +0000
@@ -0,0 +1,1010 @@
+/* edataserver-1.2.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "E", gir_namespace = "EDataServer", gir_version = "1.2", lower_case_cprefix = "e_")]
+namespace E {
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Compact]
+	public class AsyncClosure {
+		public static void callback (GLib.Object object, GLib.AsyncResult result, void* closure);
+		public void free ();
+		public unowned GLib.AsyncResult wait ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_client_get_type ()")]
+	public abstract class Client : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected Client ();
+		[Deprecated (since = "3.8")]
+		public void cancel_all ();
+		public bool check_capability (string capability);
+		public bool check_refresh_supported ();
+		[Deprecated (since = "3.8")]
+		public static GLib.Error error_create (E.ClientError code, string custom_msg);
+		public static GLib.Quark error_quark ();
+		public static unowned string error_to_string (E.ClientError code);
+		public virtual async bool get_backend_property (string prop_name, GLib.Cancellable? cancellable, out string prop_value) throws GLib.Error;
+		public virtual bool get_backend_property_sync (string prop_name, out string prop_value, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public unowned GLib.SList<string> get_capabilities ();
+		public unowned E.Source get_source ();
+		public bool is_online ();
+		[Deprecated (since = "3.8")]
+		public bool is_opened ();
+		public bool is_readonly ();
+		[Deprecated (since = "3.8")]
+		public virtual async bool open (bool only_if_exists, GLib.Cancellable? cancellable) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual bool open_sync (bool only_if_exists, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public GLib.MainContext ref_main_context ();
+		public virtual async bool refresh (GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual bool refresh_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[Deprecated (since = "3.6")]
+		public virtual async bool remove (GLib.Cancellable? cancellable) throws GLib.Error;
+		[Deprecated (since = "3.6")]
+		public virtual bool remove_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual async bool retrieve_capabilities (GLib.Cancellable? cancellable, out string capabilities) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual bool retrieve_capabilities_sync (out string capabilities, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual async bool set_backend_property (string prop_name, string prop_value, GLib.Cancellable? cancellable) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual bool set_backend_property_sync (string prop_name, string prop_value, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public virtual void unwrap_dbus_error (GLib.Error dbus_error) throws GLib.Error;
+		[Deprecated (since = "3.8")]
+		public static GLib.SList<GLib.Object> util_copy_object_slist (GLib.SList<GLib.Object>? copy_to, GLib.SList<GLib.Object> objects);
+		[Deprecated (since = "3.8")]
+		public static GLib.SList<string> util_copy_string_slist (GLib.SList<string>? copy_to, GLib.SList<string> strings);
+		[Deprecated (since = "3.8")]
+		public static void util_free_object_slist (GLib.SList<GLib.Object> objects);
+		[Deprecated (since = "3.8")]
+		public static void util_free_string_slist (GLib.SList<string> strings);
+		public static GLib.SList<string> util_parse_comma_strings (string strings);
+		[CCode (array_length = false, array_null_terminated = true)]
+		[Deprecated (since = "3.8")]
+		public static string[] util_slist_to_strv (GLib.SList<string> strings);
+		[Deprecated (since = "3.8")]
+		public static GLib.SList<string> util_strv_to_slist (string strv);
+		[Deprecated (since = "3.8")]
+		public static bool util_unwrap_dbus_error (GLib.Error dbus_error, out GLib.Error client_error, E.ClientErrorsList known_errors, uint known_errors_count, GLib.Quark known_errors_domain, bool fail_when_none_matched);
+		public void* capabilities { get; }
+		[NoAccessorMethod]
+		public GLib.MainContext main_context { owned get; }
+		[NoAccessorMethod]
+		public bool online { get; set; }
+		[NoAccessorMethod]
+		public virtual bool opened { get; }
+		[NoAccessorMethod]
+		public bool readonly { get; }
+		public E.Source source { get; construct; }
+		public virtual signal void backend_died ();
+		public virtual signal void backend_error (string error_msg);
+		public virtual signal void backend_property_changed (string prop_name, string prop_value);
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Compact]
+	public class Flag {
+		public void clear ();
+		public void free ();
+		public bool is_set ();
+		public void @set ();
+		[Deprecated (since = "3.8")]
+		public bool timed_wait (GLib.TimeVal abs_time);
+		public void wait ();
+		public bool wait_until (int64 end_time);
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Compact]
+	public class MemChunk {
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "e_named_parameters_get_type ()")]
+	[Compact]
+	public class NamedParameters {
+		[CCode (has_construct_function = false)]
+		public NamedParameters ();
+		public void assign (E.NamedParameters? from);
+		public void clear ();
+		public void free ();
+		public unowned string @get (string name);
+		public void @set (string name, string? value);
+		[CCode (has_construct_function = false)]
+		public NamedParameters.strv (string strv);
+		public bool test (string name, string value, bool case_sensitively);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] to_strv ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Compact]
+	public class OperationPool {
+		public void free ();
+		public void push (void* opdata);
+		public void release_opid (uint32 opid);
+		public uint32 reserve_opid ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_proxy_get_type ()")]
+	public class Proxy : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Proxy ();
+		public bool require_proxy_for_uri (string uri);
+		public void setup_proxy ();
+		public virtual signal void changed ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_get_type ()")]
+	public class Source : GLib.Object, GLib.Initable {
+		[CCode (has_construct_function = false)]
+		public Source (GLib.DBusObject? dbus_object, GLib.MainContext? main_context) throws GLib.Error;
+		public int compare_by_display_name (E.Source source2);
+		public string dup_display_name ();
+		public string dup_parent ();
+		public string dup_uid ();
+		public bool equal (E.Source source2);
+		public unowned string get_display_name ();
+		public bool get_enabled ();
+		public unowned E.SourceExtension get_extension (string extension_name);
+		public virtual async bool get_oauth2_access_token (GLib.Cancellable? cancellable, out string? access_token, out int? expires_in) throws GLib.Error;
+		public virtual bool get_oauth2_access_token_sync (GLib.Cancellable? cancellable, out string? access_token, out int? expires_in) throws GLib.Error;
+		public unowned string get_parent ();
+		public bool get_remote_creatable ();
+		public bool get_remote_deletable ();
+		public bool get_removable ();
+		public unowned string get_uid ();
+		public bool get_writable ();
+		public bool has_extension (string extension_name);
+		public uint hash ();
+		public async bool mail_signature_load (int io_priority, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool mail_signature_load_sync (string contents, size_t? length, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool mail_signature_replace (string contents, size_t length, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool mail_signature_replace_sync (string contents, size_t length, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool mail_signature_symlink (string symlink_target, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool mail_signature_symlink_sync (string symlink_target, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public static string parameter_to_key (string param_name);
+		public GLib.DBusObject ref_dbus_object ();
+		public GLib.MainContext ref_main_context ();
+		public uint refresh_add_timeout (GLib.MainContext? context, owned E.SourceRefreshFunc callback);
+		public void refresh_force_timeout ();
+		public bool refresh_remove_timeout (uint refresh_timeout_id);
+		public uint refresh_remove_timeouts_by_data (void* user_data);
+		public virtual async bool remote_create (E.Source scratch_source, GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual bool remote_create_sync (E.Source scratch_source, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual async bool remote_delete (GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual bool remote_delete_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual async bool remove (GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual bool remove_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public void set_display_name (string display_name);
+		public void set_enabled (bool enabled);
+		public void set_parent (string? parent);
+		public string to_string (size_t? length);
+		[CCode (has_construct_function = false)]
+		public Source.with_uid (string uid, GLib.MainContext? main_context) throws GLib.Error;
+		public virtual async bool write (GLib.Cancellable? cancellable) throws GLib.Error;
+		public virtual bool write_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public string display_name { get; set construct; }
+		public bool enabled { get; set construct; }
+		[NoAccessorMethod]
+		public GLib.MainContext main_context { owned get; construct; }
+		public string parent { get; set; }
+		public bool remote_creatable { get; }
+		public bool remote_deletable { get; }
+		public bool removable { get; }
+		public string uid { get; construct; }
+		public bool writable { get; }
+		[HasEmitter]
+		public virtual signal void changed ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_address_book_get_type ()")]
+	public class SourceAddressBook : E.SourceBackend {
+		[CCode (has_construct_function = false)]
+		protected SourceAddressBook ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_alarms_get_type ()")]
+	public class SourceAlarms : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceAlarms ();
+		public string dup_last_notified ();
+		public bool get_include_me ();
+		public unowned string get_last_notified ();
+		public void set_include_me (bool include_me);
+		public void set_last_notified (string? last_notified);
+		public bool include_me { get; set construct; }
+		public string last_notified { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_authentication_get_type ()")]
+	public class SourceAuthentication : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceAuthentication ();
+		public string dup_host ();
+		public string dup_method ();
+		public string dup_user ();
+		public unowned string get_host ();
+		public unowned string get_method ();
+		public uint16 get_port ();
+		public bool get_remember_password ();
+		public unowned string get_user ();
+		public GLib.SocketConnectable ref_connectable ();
+		public bool required ();
+		public void set_host (string? host);
+		public void set_method (string? method);
+		public void set_port (uint16 port);
+		public void set_remember_password (bool remember_password);
+		public void set_user (string? user);
+		[NoAccessorMethod]
+		public GLib.SocketConnectable connectable { owned get; }
+		public string host { get; set construct; }
+		public string method { get; set construct; }
+		public uint port { get; set construct; }
+		public bool remember_password { get; set construct; }
+		public string user { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_autocomplete_get_type ()")]
+	public class SourceAutocomplete : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceAutocomplete ();
+		public bool get_include_me ();
+		public void set_include_me (bool include_me);
+		public bool include_me { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_backend_get_type ()")]
+	public abstract class SourceBackend : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceBackend ();
+		public string dup_backend_name ();
+		public unowned string get_backend_name ();
+		public void set_backend_name (string? backend_name);
+		public string backend_name { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_calendar_get_type ()")]
+	public class SourceCalendar : E.SourceSelectable {
+		[CCode (has_construct_function = false)]
+		protected SourceCalendar ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_camel_get_type ()")]
+	public abstract class SourceCamel : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceCamel ();
+		public static GLib.Type generate_subtype (string protocol, GLib.Type settings_type);
+		public static unowned string get_extension_name (string protocol);
+		public static unowned string get_type_name (string protocol);
+		public static void register_types ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_collection_get_type ()")]
+	public class SourceCollection : E.SourceBackend {
+		[CCode (has_construct_function = false)]
+		protected SourceCollection ();
+		public string dup_identity ();
+		public bool get_calendar_enabled ();
+		public bool get_contacts_enabled ();
+		public unowned string get_identity ();
+		public bool get_mail_enabled ();
+		public void set_calendar_enabled (bool calendar_enabled);
+		public void set_contacts_enabled (bool contacts_enabled);
+		public void set_identity (string? identity);
+		public void set_mail_enabled (bool mail_enabled);
+		public bool calendar_enabled { get; set construct; }
+		public bool contacts_enabled { get; set construct; }
+		public string identity { get; set construct; }
+		public bool mail_enabled { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_extension_get_type ()")]
+	public abstract class SourceExtension : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected SourceExtension ();
+		[Deprecated (since = "3.8")]
+		public unowned E.Source get_source ();
+		public E.Source source { get; construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_goa_get_type ()")]
+	public class SourceGoa : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceGoa ();
+		public string dup_account_id ();
+		public string dup_calendar_url ();
+		public string dup_contacts_url ();
+		public unowned string get_account_id ();
+		public unowned string get_calendar_url ();
+		public unowned string get_contacts_url ();
+		public void set_account_id (string? account_id);
+		public void set_calendar_url (string? calendar_url);
+		public void set_contacts_url (string? contacts_url);
+		public string account_id { get; set construct; }
+		public string calendar_url { get; set construct; }
+		public string contacts_url { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mdn_get_type ()")]
+	public class SourceMDN : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceMDN ();
+		public E.MdnResponsePolicy get_response_policy ();
+		public void set_response_policy (E.MdnResponsePolicy response_policy);
+		public E.MdnResponsePolicy response_policy { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_account_get_type ()")]
+	public class SourceMailAccount : E.SourceBackend {
+		[CCode (has_construct_function = false)]
+		protected SourceMailAccount ();
+		public string dup_identity_uid ();
+		public unowned string get_identity_uid ();
+		public void set_identity_uid (string? identity_uid);
+		public string identity_uid { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_composition_get_type ()")]
+	public class SourceMailComposition : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceMailComposition ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] dup_bcc ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] dup_cc ();
+		public string dup_drafts_folder ();
+		public string dup_templates_folder ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_bcc ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_cc ();
+		public unowned string get_drafts_folder ();
+		public bool get_sign_imip ();
+		public unowned string get_templates_folder ();
+		public void set_bcc (string? bcc);
+		public void set_cc (string? cc);
+		public void set_drafts_folder (string? drafts_folder);
+		public void set_sign_imip (bool sign_imip);
+		public void set_templates_folder (string? templates_folder);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] bcc { get; set construct; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] cc { get; set construct; }
+		public string drafts_folder { get; set construct; }
+		public bool sign_imip { get; set construct; }
+		public string templates_folder { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_identity_get_type ()")]
+	public class SourceMailIdentity : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceMailIdentity ();
+		public string dup_address ();
+		public string dup_name ();
+		public string dup_organization ();
+		public string dup_reply_to ();
+		public string dup_signature_uid ();
+		public unowned string get_address ();
+		public unowned string get_name ();
+		public unowned string get_organization ();
+		public unowned string get_reply_to ();
+		public unowned string get_signature_uid ();
+		public void set_address (string? address);
+		public void set_name (string? name);
+		public void set_organization (string? organization);
+		public void set_reply_to (string? reply_to);
+		public void set_signature_uid (string? signature_uid);
+		public string address { get; set construct; }
+		public string name { get; set construct; }
+		public string organization { get; set construct; }
+		public string reply_to { get; set construct; }
+		public string signature_uid { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_signature_get_type ()")]
+	public class SourceMailSignature : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceMailSignature ();
+		public string dup_mime_type ();
+		public unowned GLib.File get_file ();
+		public unowned string get_mime_type ();
+		public void set_mime_type (string? mime_type);
+		public GLib.File file { get; }
+		public string mime_type { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_submission_get_type ()")]
+	public class SourceMailSubmission : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceMailSubmission ();
+		public string dup_sent_folder ();
+		public string dup_transport_uid ();
+		public bool get_replies_to_origin_folder ();
+		public unowned string get_sent_folder ();
+		public unowned string get_transport_uid ();
+		public void set_replies_to_origin_folder (bool replies_to_origin_folder);
+		public void set_sent_folder (string? sent_folder);
+		public void set_transport_uid (string? transport_uid);
+		public bool replies_to_origin_folder { get; set construct; }
+		public string sent_folder { get; set construct; }
+		public string transport_uid { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_mail_transport_get_type ()")]
+	public class SourceMailTransport : E.SourceBackend {
+		[CCode (has_construct_function = false)]
+		protected SourceMailTransport ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_memo_list_get_type ()")]
+	public class SourceMemoList : E.SourceSelectable {
+		[CCode (has_construct_function = false)]
+		protected SourceMemoList ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_offline_get_type ()")]
+	public class SourceOffline : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceOffline ();
+		public bool get_stay_synchronized ();
+		public void set_stay_synchronized (bool stay_synchronized);
+		public bool stay_synchronized { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", lower_case_csuffix = "source_openpgp", type_id = "e_source_openpgp_get_type ()")]
+	public class SourceOpenPGP : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceOpenPGP ();
+		public string dup_key_id ();
+		public string dup_signing_algorithm ();
+		public bool get_always_trust ();
+		public bool get_encrypt_to_self ();
+		public unowned string get_key_id ();
+		public bool get_sign_by_default ();
+		public unowned string get_signing_algorithm ();
+		public void set_always_trust (bool always_trust);
+		public void set_encrypt_to_self (bool encrypt_to_self);
+		public void set_key_id (string key_id);
+		public void set_sign_by_default (bool sign_by_default);
+		public void set_signing_algorithm (string signing_algorithm);
+		public bool always_trust { get; set construct; }
+		public bool encrypt_to_self { get; set construct; }
+		public string key_id { get; set construct; }
+		public bool sign_by_default { get; set construct; }
+		public string signing_algorithm { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_refresh_get_type ()")]
+	public class SourceRefresh : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceRefresh ();
+		public bool get_enabled ();
+		public uint get_interval_minutes ();
+		public void set_enabled (bool enabled);
+		public void set_interval_minutes (uint interval_minutes);
+		public bool enabled { get; set construct; }
+		public uint interval_minutes { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_registry_get_type ()")]
+	public class SourceRegistry : GLib.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cname = "e_source_registry_new", has_construct_function = false)]
+		public async SourceRegistry (GLib.Cancellable? cancellable) throws GLib.Error;
+		public async bool authenticate (E.Source source, E.SourceAuthenticator auth, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool authenticate_sync (E.Source source, E.SourceAuthenticator auth, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool check_enabled (E.Source source);
+		public async bool commit_source (E.Source source, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool commit_source_sync (E.Source source, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool create_sources (GLib.List<E.Source> list_of_sources, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool create_sources_sync (GLib.List<E.Source> list_of_sources, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public void debug_dump (string? extension_name);
+		public string dup_unique_display_name (E.Source source, string? extension_name);
+		public E.Source find_extension (E.Source source, string extension_name);
+		public static void free_display_tree (GLib.Node display_tree);
+		public GLib.List<E.Source> list_sources (string? extension_name);
+		public E.Source ref_builtin_address_book ();
+		public E.Source ref_builtin_calendar ();
+		public E.Source ref_builtin_mail_account ();
+		public E.Source ref_builtin_memo_list ();
+		public E.Source ref_builtin_task_list ();
+		public E.Source ref_default_address_book ();
+		public E.Source ref_default_calendar ();
+		public E.Source ref_default_for_extension_name (string extension_name);
+		public E.Source ref_default_mail_account ();
+		public E.Source ref_default_mail_identity ();
+		public E.Source ref_default_memo_list ();
+		public E.Source ref_default_task_list ();
+		public E.Source ref_source (string uid);
+		public void set_default_address_book (E.Source? default_source);
+		public void set_default_calendar (E.Source? default_source);
+		public void set_default_for_extension_name (string extension_name, E.Source? default_source);
+		public void set_default_mail_account (E.Source? default_source);
+		public void set_default_mail_identity (E.Source? default_source);
+		public void set_default_memo_list (E.Source? default_source);
+		public void set_default_task_list (E.Source? default_source);
+		[CCode (has_construct_function = false)]
+		public SourceRegistry.sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[NoAccessorMethod]
+		public E.Source default_address_book { owned get; set; }
+		[NoAccessorMethod]
+		public E.Source default_calendar { owned get; set; }
+		[NoAccessorMethod]
+		public E.Source default_mail_account { owned get; set; }
+		[NoAccessorMethod]
+		public E.Source default_mail_identity { owned get; set; }
+		[NoAccessorMethod]
+		public E.Source default_memo_list { owned get; set; }
+		[NoAccessorMethod]
+		public E.Source default_task_list { owned get; set; }
+		public virtual signal void source_added (E.Source source);
+		public virtual signal void source_changed (E.Source source);
+		public virtual signal void source_disabled (E.Source source);
+		public virtual signal void source_enabled (E.Source source);
+		public virtual signal void source_removed (E.Source source);
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_resource_get_type ()")]
+	public class SourceResource : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceResource ();
+		public string dup_identity ();
+		public unowned string get_identity ();
+		public void set_identity (string? identity);
+		public string identity { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_revision_guards_get_type ()")]
+	public class SourceRevisionGuards : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceRevisionGuards ();
+		public bool get_enabled ();
+		public void set_enabled (bool enabled);
+		public bool enabled { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_smime_get_type ()")]
+	public class SourceSMIME : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceSMIME ();
+		public string dup_encryption_certificate ();
+		public string dup_signing_algorithm ();
+		public string dup_signing_certificate ();
+		public bool get_encrypt_by_default ();
+		public bool get_encrypt_to_self ();
+		public unowned string get_encryption_certificate ();
+		public bool get_sign_by_default ();
+		public unowned string get_signing_algorithm ();
+		public unowned string get_signing_certificate ();
+		public void set_encrypt_by_default (bool encrypt_by_default);
+		public void set_encrypt_to_self (bool encrypt_to_self);
+		public void set_encryption_certificate (string? encryption_certificate);
+		public void set_sign_by_default (bool sign_by_default);
+		public void set_signing_algorithm (string? signing_algorithm);
+		public void set_signing_certificate (string? signing_certificate);
+		public bool encrypt_by_default { get; set construct; }
+		public bool encrypt_to_self { get; set construct; }
+		public string encryption_certificate { get; set construct; }
+		public bool sign_by_default { get; set construct; }
+		public string signing_algorithm { get; set construct; }
+		public string signing_certificate { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_security_get_type ()")]
+	public class SourceSecurity : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceSecurity ();
+		public string dup_method ();
+		public unowned string get_method ();
+		public bool get_secure ();
+		public void set_method (string? method);
+		public void set_secure (bool secure);
+		public string method { get; set construct; }
+		public bool secure { get; set; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_selectable_get_type ()")]
+	public abstract class SourceSelectable : E.SourceBackend {
+		[CCode (has_construct_function = false)]
+		protected SourceSelectable ();
+		public string dup_color ();
+		public unowned string get_color ();
+		public bool get_selected ();
+		public void set_color (string? color);
+		public void set_selected (bool selected);
+		public string color { get; set construct; }
+		public bool selected { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_task_list_get_type ()")]
+	public class SourceTaskList : E.SourceSelectable {
+		[CCode (has_construct_function = false)]
+		protected SourceTaskList ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_uoa_get_type ()")]
+	public class SourceUoa : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceUoa ();
+		public uint get_account_id ();
+		public void set_account_id (uint account_id);
+		public uint account_id { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_id = "e_source_webdav_get_type ()")]
+	public class SourceWebdav : E.SourceExtension {
+		[CCode (has_construct_function = false)]
+		protected SourceWebdav ();
+		public string dup_display_name ();
+		public string dup_email_address ();
+		public string dup_resource_path ();
+		public string dup_resource_query ();
+		public string dup_ssl_trust ();
+		public Soup.URI dup_soup_uri ();
+		public bool get_avoid_ifmatch ();
+		public bool get_calendar_auto_schedule ();
+		public unowned string get_display_name ();
+		public unowned string get_email_address ();
+		[Deprecated (since = "3.8")]
+		public bool get_ignore_invalid_cert ();
+		public unowned string get_resource_path ();
+		public unowned string get_resource_query ();
+		public unowned string get_ssl_trust ();
+		public void set_avoid_ifmatch (bool avoid_ifmatch);
+		public void set_calendar_auto_schedule (bool calendar_auto_schedule);
+		public void set_display_name (string? display_name);
+		public void set_email_address (string? email_address);
+		[Deprecated (since = "3.8")]
+		public void set_ignore_invalid_cert (bool ignore_invalid_cert);
+		public void set_resource_path (string? resource_path);
+		public void set_resource_query (string? resource_query);
+		public void set_ssl_trust (string? ssl_trust);
+		public void set_soup_uri (Soup.URI? soup_uri);
+		public void unset_temporary_ssl_trust ();
+		public bool avoid_ifmatch { get; set construct; }
+		public bool calendar_auto_schedule { get; set construct; }
+		public string display_name { get; set construct; }
+		public string email_address { get; set construct; }
+		public bool ignore_invalid_cert { get; set construct; }
+		public string resource_path { get; set construct; }
+		public string resource_query { get; set construct; }
+		public string ssl_trust { get; set construct; }
+		public Soup.URI soup_uri { get; set construct; }
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Compact]
+	public class XmlHash {
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", type_cname = "ESourceAuthenticatorInterface", type_id = "e_source_authenticator_get_type ()")]
+	public interface SourceAuthenticator : GLib.Object {
+		public abstract void get_prompt_strings (E.Source source, out string prompt_title, out string prompt_message, out string prompt_description);
+		public abstract async E.SourceAuthenticationResult try_password (GLib.StringBuilder password, GLib.Cancellable? cancellable) throws GLib.Error;
+		public abstract E.SourceAuthenticationResult try_password_sync (GLib.StringBuilder password, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", has_type_id = false)]
+	public struct CancellableMutex {
+		public void* @base;
+		public weak GLib.Mutex mutex;
+		public void clear ();
+		public void init ();
+		public bool @lock (GLib.Cancellable? cancellable = null);
+		public void unlock ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", has_type_id = false)]
+	public struct CancellableRecMutex {
+		public void* @base;
+		public GLib.RecMutex rec_mutex;
+		public void clear ();
+		public void init ();
+		public bool @lock (GLib.Cancellable? cancellable = null);
+		public void unlock ();
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", has_type_id = false)]
+	[Deprecated (since = "3.8")]
+	public struct ClientErrorsList {
+		public weak string name;
+		public int err_code;
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "_ECancellableLocksBase", has_type_id = false)]
+	public struct _CancellableLocksBase {
+		public weak GLib.Mutex cond_mutex;
+		public weak GLib.Cond cond;
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_CLIENT_ERROR_", has_type_id = false)]
+	public enum ClientError {
+		INVALID_ARG,
+		BUSY,
+		SOURCE_NOT_LOADED,
+		SOURCE_ALREADY_LOADED,
+		AUTHENTICATION_FAILED,
+		AUTHENTICATION_REQUIRED,
+		REPOSITORY_OFFLINE,
+		OFFLINE_UNAVAILABLE,
+		PERMISSION_DENIED,
+		CANCELLED,
+		COULD_NOT_CANCEL,
+		NOT_SUPPORTED,
+		TLS_NOT_AVAILABLE,
+		UNSUPPORTED_AUTHENTICATION_METHOD,
+		SEARCH_SIZE_LIMIT_EXCEEDED,
+		SEARCH_TIME_LIMIT_EXCEEDED,
+		INVALID_QUERY,
+		QUERY_REFUSED,
+		DBUS_ERROR,
+		OTHER_ERROR,
+		NOT_OPENED,
+		OUT_OF_SYNC
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_MDN_RESPONSE_POLICY_", type_id = "e_mdn_response_policy_get_type ()")]
+	public enum MdnResponsePolicy {
+		NEVER,
+		ALWAYS,
+		ASK
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_SOURCE_AUTHENTICATION_", type_id = "e_source_authentication_result_get_type ()")]
+	public enum SourceAuthenticationResult {
+		ERROR,
+		ACCEPTED,
+		REJECTED
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_TIME_PARSE_", has_type_id = false)]
+	public enum TimeParseStatus {
+		OK,
+		NONE,
+		INVALID
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_TRUST_PROMPT_RESPONSE_", type_id = "e_trust_prompt_response_get_type ()")]
+	public enum TrustPromptResponse {
+		UNKNOWN,
+		REJECT,
+		ACCEPT,
+		ACCEPT_TEMPORARILY,
+		REJECT_TEMPORARILY
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_XMLHASH_STATUS_", has_type_id = false)]
+	public enum XmlHashStatus {
+		SAME,
+		DIFFERENT,
+		NOT_FOUND
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cprefix = "E_XML_HASH_TYPE_", has_type_id = false)]
+	public enum XmlHashType {
+		OBJECT_UID,
+		PROPERTY
+	}
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", instance_pos = 1.9)]
+	public delegate void SourceRefreshFunc (E.Source source);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", instance_pos = 2.9)]
+	public delegate void XmlHashFunc (string key, string value);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", instance_pos = 2.9)]
+	public delegate bool XmlHashRemoveFunc (string key, string value);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_AUTH_METHOD")]
+	public const string CREDENTIALS_KEY_AUTH_METHOD;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_FOREIGN_REQUEST")]
+	public const string CREDENTIALS_KEY_FOREIGN_REQUEST;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PASSWORD")]
+	public const string CREDENTIALS_KEY_PASSWORD;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PROMPT_FLAGS")]
+	public const string CREDENTIALS_KEY_PROMPT_FLAGS;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PROMPT_KEY")]
+	public const string CREDENTIALS_KEY_PROMPT_KEY;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PROMPT_REASON")]
+	public const string CREDENTIALS_KEY_PROMPT_REASON;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PROMPT_TEXT")]
+	public const string CREDENTIALS_KEY_PROMPT_TEXT;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_PROMPT_TITLE")]
+	public const string CREDENTIALS_KEY_PROMPT_TITLE;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_CREDENTIALS_KEY_USERNAME")]
+	public const string CREDENTIALS_KEY_USERNAME;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_DEBUG_LOG_DOMAIN_CAL_QUERIES")]
+	public const string DEBUG_LOG_DOMAIN_CAL_QUERIES;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_DEBUG_LOG_DOMAIN_GLOG")]
+	public const string DEBUG_LOG_DOMAIN_GLOG;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_DEBUG_LOG_DOMAIN_USER")]
+	public const string DEBUG_LOG_DOMAIN_USER;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_ADDRESS_BOOK")]
+	public const string SOURCE_EXTENSION_ADDRESS_BOOK;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_ALARMS")]
+	public const string SOURCE_EXTENSION_ALARMS;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_AUTHENTICATION")]
+	public const string SOURCE_EXTENSION_AUTHENTICATION;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_AUTOCOMPLETE")]
+	public const string SOURCE_EXTENSION_AUTOCOMPLETE;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_CALENDAR")]
+	public const string SOURCE_EXTENSION_CALENDAR;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_COLLECTION")]
+	public const string SOURCE_EXTENSION_COLLECTION;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_GOA")]
+	public const string SOURCE_EXTENSION_GOA;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_ACCOUNT")]
+	public const string SOURCE_EXTENSION_MAIL_ACCOUNT;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_COMPOSITION")]
+	public const string SOURCE_EXTENSION_MAIL_COMPOSITION;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_IDENTITY")]
+	public const string SOURCE_EXTENSION_MAIL_IDENTITY;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_SIGNATURE")]
+	public const string SOURCE_EXTENSION_MAIL_SIGNATURE;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_SUBMISSION")]
+	public const string SOURCE_EXTENSION_MAIL_SUBMISSION;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MAIL_TRANSPORT")]
+	public const string SOURCE_EXTENSION_MAIL_TRANSPORT;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MDN")]
+	public const string SOURCE_EXTENSION_MDN;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_MEMO_LIST")]
+	public const string SOURCE_EXTENSION_MEMO_LIST;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_OFFLINE")]
+	public const string SOURCE_EXTENSION_OFFLINE;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_OPENPGP")]
+	public const string SOURCE_EXTENSION_OPENPGP;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_REFRESH")]
+	public const string SOURCE_EXTENSION_REFRESH;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_RESOURCE")]
+	public const string SOURCE_EXTENSION_RESOURCE;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_REVISION_GUARDS")]
+	public const string SOURCE_EXTENSION_REVISION_GUARDS;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_SECURITY")]
+	public const string SOURCE_EXTENSION_SECURITY;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_SMIME")]
+	public const string SOURCE_EXTENSION_SMIME;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_TASK_LIST")]
+	public const string SOURCE_EXTENSION_TASK_LIST;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_UOA")]
+	public const string SOURCE_EXTENSION_UOA;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_EXTENSION_WEBDAV_BACKEND")]
+	public const string SOURCE_EXTENSION_WEBDAV_BACKEND;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h", cname = "E_SOURCE_PARAM_SETTING")]
+	public const int SOURCE_PARAM_SETTING;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool binding_transform_enum_nick_to_value (GLib.Binding binding, GLib.Value source_value, GLib.Value target_value, void* not_used);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool binding_transform_enum_value_to_nick (GLib.Binding binding, GLib.Value source_value, GLib.Value target_value, void* not_used);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void categories_add (string category, string unused, string icon_file, bool searchable);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool categories_exist (string category);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string categories_get_icon_file_for (string category);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static GLib.List<weak string> categories_get_list ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool categories_is_searchable (string category);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void categories_register_change_listener (GLib.Callback listener);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void categories_remove (string category);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void categories_set_icon_file_for (string category, string icon_file);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void categories_unregister_change_listener (GLib.Callback listener);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static int data_server_util_get_dbus_call_timeout ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static void data_server_util_set_dbus_call_timeout (int timeout_msec);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void debug_log_clear ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void debug_log_disable_domains (string domains, int n_domains);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool debug_log_dump (string filename) throws GLib.Error;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool debug_log_dump_to_dated_file () throws GLib.Error;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void debug_log_enable_domains (string domains, int n_domains);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static int debug_log_get_max_lines ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool debug_log_is_domain_enabled (string domain);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool debug_log_load_configuration (string filename) throws GLib.Error;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void debug_log_set_max_lines (int num_lines);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool enum_from_string (GLib.Type enum_type, string string, int enum_value);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string enum_to_string (GLib.Type enum_type, int enum_value);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static async bool file_recursive_delete (GLib.File file, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static bool file_recursive_delete_sync (GLib.File file, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void filename_make_safe (string string);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string filename_mkdir_encoded (string basepath, string fileprefix, string filename, int fileindex);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__OBJECT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__OBJECT_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__OBJECT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__OBJECT_UINT (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_BOOLEAN__POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_VOID__UINT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_VOID__UINT_BOXED_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_VOID__UINT_BOXED_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void gdbus_marshallers_VOID__UINT_STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string get_user_cache_dir ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string get_user_config_dir ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string get_user_data_dir ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void localtime_with_offset (long tt, void* tm, int offset);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void marshal_VOID__INT_STRING_STRING_STRING_STRING_BOOLEAN_POINTER (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void marshal_VOID__OBJECT_BOXED (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void* memchunk_alloc (E.MemChunk memchunk);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void* memchunk_alloc0 (E.MemChunk memchunk);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void memchunk_clean (E.MemChunk memchunk);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void memchunk_destroy (E.MemChunk memchunk);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void memchunk_empty (E.MemChunk memchunk);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void memchunk_free (E.MemChunk memchunk, void* mem);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static long mktime_utc (void* tm);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void queue_transfer (GLib.Queue src_queue, GLib.Queue dst_queue);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static size_t strftime (string string, size_t max, string fmt, void* tm);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void time_format_date_and_time (void* date_tm, bool use_24_hour_format, bool show_midnight, bool show_zero_seconds, string buffer, int buffer_size);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void time_format_time (void* date_tm, bool use_24_hour_format, bool show_zero_seconds, string buffer, int buffer_size);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string time_get_d_fmt_with_4digit_year ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.TimeParseStatus time_parse_date (string value, void* result);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.TimeParseStatus time_parse_date_and_time (string value, void* result);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.TimeParseStatus time_parse_date_and_time_ex (string value, void* result, bool two_digit_year);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.TimeParseStatus time_parse_date_ex (string value, void* result, bool two_digit_year);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.TimeParseStatus time_parse_time (string value, void* result);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string uid_new ();
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static size_t utf8_strftime (string string, size_t max, string fmt, void* tm);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static GLib.SList<GLib.Object> util_copy_object_slist (GLib.SList<GLib.Object>? copy_to, GLib.SList<GLib.Object> objects);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static GLib.SList<string> util_copy_string_slist (GLib.SList<string>? copy_to, GLib.SList<string> strings);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string util_ensure_gdbus_string (string str, string gdbus_str);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void util_free_nullable_object_slist (GLib.SList<GLib.Object> objects);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static void util_free_object_slist (GLib.SList<GLib.Object> objects);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	[Deprecated (since = "3.8")]
+	public static void util_free_string_slist (GLib.SList<string> strings);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static uint64 util_gthread_id (GLib.Thread thread);
+	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "libedataserver/libedataserver.h")]
+	public static string[] util_slist_to_strv (GLib.SList<string> strings);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_strdup_strip (string? string);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_strstrcase (string haystack, string needle);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static GLib.SList<string> util_strv_to_slist (string strv);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_unicode_get_utf8 (string text, unichar @out);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_utf8_data_make_valid (string data, size_t data_bytes);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_utf8_make_valid (string str);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_utf8_normalize (string str);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static string util_utf8_remove_accents (string str);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static int util_utf8_strcasecmp (string s1, string s2);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string util_utf8_strstrcase (string haystack, string needle);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static unowned string util_utf8_strstrcasedecomp (string haystack, string needle);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xml_destroy_hash (GLib.HashTable<void*,void*> hash);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static GLib.HashTable<void*,void*> xml_to_hash (Xml.Doc doc, E.XmlHashType type);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_add (E.XmlHash hash, string key, string data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static E.XmlHashStatus xmlhash_compare (E.XmlHash hash, string key, string compare_data);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_destroy (E.XmlHash hash);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_foreach_key (E.XmlHash hash, E.XmlHashFunc func);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_foreach_key_remove (E.XmlHash hash, E.XmlHashRemoveFunc func);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_remove (E.XmlHash hash, string key);
+	[CCode (cheader_filename = "libedataserver/libedataserver.h")]
+	public static void xmlhash_write (E.XmlHash hash);
+}
\ No newline at end of file

=== added file 'vapi/libical.metadata'
--- vapi/libical.metadata	1970-01-01 00:00:00 +0000
+++ vapi/libical.metadata	2016-02-03 23:24:26 +0000
@@ -0,0 +1,36 @@
+# libical.metadata
+
+iCal cheader_filename="libical/ical.h" cprefix=""
+
+# TODO
+
+#--- classes ---#
+
+icalattachtype hidden="1" # seems private
+icalproperty_add_parameters.prop type_name="icalproperty"
+icalproperty_impl hidden="1" # private
+
+#--- structs ---#
+
+icaldatetimeperiodtype is_value_type="1"
+icalgeotype is_value_type="1"
+icalperiodtype is_value_type="1"
+icalrecurrencetype is_value_type="1"
+icalreqstattype is_value_type="1"
+icaltimetype is_value_type="1" simple_type="1"
+icaltimezonephase is_value_type="1"
+icaltimezonetype is_value_type="1"
+icaltriggertype is_value_type="1"
+sspm_action_map is_value_type="1"
+sspm_header is_value_type="1"
+sspm_part is_value_type="1"
+
+#--- functions ---#
+
+icalrecur_expand_recurrence.start type_name="time_t"
+
+icalrecur_expand_recurrence.count hidden="1"
+icalrecur_expand_recurrence.array type_name="time_t" is_array="1" array_length_type="int" array_length_pos="2"
+
+icaltime_from_timet.v type_name="time_t"
+icaltime_from_timet_with_zone.tm type_name="time_t"

=== added file 'vapi/libical.vapi'
--- vapi/libical.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libical.vapi	2016-02-03 23:24:26 +0000
@@ -0,0 +1,2964 @@
+/* libical.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "")]
+namespace iCal {
+	[CCode (cheader_filename = "libical/ical.h", free_function = "icalarray_free", cname = "icalarray")]
+	[Compact]
+	public class Array<G> {
+		public G data;
+		public uint element_size;
+		public uint increment_size;
+		public uint num_elements;
+		public uint space_allocated;
+		[CCode (cname = "icalarray_new", has_construct_function = false)]
+		public Array (int element_size, int increment_size);
+		[CCode (cname = "icalarray_append")]
+		public void append (G element);
+		[CCode (cname = "icalarray_element_at")]
+		public G element_at (int position);
+		[CCode (cname = "icalarray_remove_element_at")]
+		public void remove_element_at (int position);
+		[CCode (cname = "icalarray_sort")]
+		public void sort (GLib.Callback compare);
+	}
+	[CCode (cheader_filename = "libical/ical.h", ref_function = "icalattach_ref", ref_function_void = true, unref_function = "icalattach_unref", cname = "icalattach")]
+	[Compact]
+	public class Attach {
+		[CCode (cname = "icalattach_new_from_data", has_construct_function = false)]
+		public Attach.from_data (uint data, iCal.icalattach_free_fn_t free_fn, void* free_fn_data);
+		[CCode (cname = "icalattach_new_from_url", has_construct_function = false)]
+		public Attach.from_url (string url);
+		[CCode (cname = "icalattach_get_data")]
+		public uint get_data ();
+		[CCode (cname = "icalattach_get_is_url")]
+		public int get_is_url ();
+		[CCode (cname = "icalattach_get_url")]
+		public unowned string get_url ();
+	}
+	[CCode (cheader_filename = "libical/ical.h", cname = "icalcompiter")]
+	[Compact]
+	public class Compiter {
+		public weak iCal.PvlElement iter;
+		public iCal.ComponentKind kind;
+		[CCode (cname = "icalcompiter_deref")]
+		public unowned iCal.Component deref ();
+		[CCode (cname = "icalcompiter_next")]
+		public unowned iCal.Component next ();
+		[CCode (cname = "icalcompiter_prior")]
+		public unowned iCal.Component prior ();
+	}
+	[CCode (cheader_filename = "libical/ical.h", copy_function = "icalcomponent_new_clone", free_function = "icalcomponent_free", cname = "icalcomponent")]
+	[Compact]
+	public class Component {
+		[CCode (cname = "icalcomponent_new", has_construct_function = false)]
+		public Component (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_add_component")]
+		public void add_component (iCal.Component child);
+		[CCode (cname = "icalcomponent_add_property")]
+		public void add_property (iCal.Property property);
+		[CCode (cname = "icalcomponent_as_ical_string")]
+		public unowned string as_ical_string ();
+		[CCode (cname = "icalcomponent_as_ical_string_r")]
+		public unowned string as_ical_string_r ();
+		[CCode (cname = "icalcomponent_begin_component")]
+		public unowned iCal.Compiter begin_component (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_check_restrictions")]
+		public int check_restrictions ();
+		[CCode (cname = "icalcomponent_new_clone", has_construct_function = false)]
+		public Component.clone (iCal.Component component);
+		[CCode (cname = "icalcomponent_convert_errors")]
+		public void convert_errors ();
+		[CCode (cname = "icalcomponent_count_components")]
+		public int count_components (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_count_errors")]
+		public int count_errors ();
+		[CCode (cname = "icalcomponent_count_properties")]
+		public int count_properties (iCal.PropertyKind kind);
+		[CCode (cname = "icalcomponent_end_component")]
+		public unowned iCal.Compiter end_component (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_foreach_recurrence")]
+		public void foreach_recurrence (iCal.TimeType start, iCal.TimeType end, GLib.Callback callback, void* callback_data);
+		[CCode (cname = "icalcomponent_foreach_tzid")]
+		public void foreach_tzid (GLib.Callback callback, void* callback_data);
+		[CCode (cname = "icalcomponent_new_from_string", has_construct_function = false)]
+		public Component.from_string (string str);
+		[CCode (cname = "icalcomponent_get_comment")]
+		public unowned string get_comment ();
+		[CCode (cname = "icalcomponent_get_current_component")]
+		public unowned iCal.Component get_current_component ();
+		[CCode (cname = "icalcomponent_get_current_property")]
+		public unowned iCal.Property get_current_property ();
+		[CCode (cname = "icalcomponent_get_description")]
+		public unowned string get_description ();
+		[CCode (cname = "icalcomponent_get_dtend")]
+		public iCal.TimeType get_dtend ();
+		[CCode (cname = "icalcomponent_get_dtstamp")]
+		public iCal.TimeType get_dtstamp ();
+		[CCode (cname = "icalcomponent_get_dtstart")]
+		public iCal.TimeType get_dtstart ();
+		[CCode (cname = "icalcomponent_get_due")]
+		public iCal.TimeType get_due ();
+		[CCode (cname = "icalcomponent_get_duration")]
+		public unowned iCal.DurationType get_duration ();
+		[CCode (cname = "icalcomponent_get_first_component")]
+		public unowned iCal.Component  get_first_component (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_get_first_property")]
+		public unowned iCal.Property get_first_property (iCal.PropertyKind kind);
+		[CCode (cname = "icalcomponent_get_first_real_component")]
+		public unowned iCal.Component  get_first_real_component ();
+		[CCode (cname = "icalcomponent_get_inner")]
+		public unowned iCal.Component  get_inner ();
+		[CCode (cname = "icalcomponent_get_location")]
+		public unowned string get_location ();
+		[CCode (cname = "icalcomponent_get_method")]
+		public iCal.PropertyMethod get_method ();
+		[CCode (cname = "icalcomponent_get_next_component")]
+		public unowned iCal.Component  get_next_component (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_get_next_property")]
+		public unowned iCal.Property get_next_property (iCal.PropertyKind kind);
+		[CCode (cname = "icalcomponent_get_parent")]
+		public unowned iCal.Component  get_parent ();
+		[CCode (cname = "icalcomponent_get_recurrenceid")]
+		public iCal.TimeType get_recurrenceid ();
+		[CCode (cname = "icalcomponent_get_relcalid")]
+		public unowned string get_relcalid ();
+		[CCode (cname = "icalcomponent_get_sequence")]
+		public int get_sequence ();
+		[CCode (cname = "icalcomponent_get_span")]
+		public unowned iCal.TimeSpan get_span ();
+		[CCode (cname = "icalcomponent_get_status")]
+		public iCal.PropertyStatus get_status ();
+		[CCode (cname = "icalcomponent_get_summary")]
+		public unowned string get_summary ();
+		[CCode (cname = "icalcomponent_get_timezone")]
+		public unowned iCal.TimeZone get_timezone (string tzid);
+		[CCode (cname = "icalcomponent_get_uid")]
+		public unowned string get_uid ();
+		[CCode (cname = "icalcomponent_is_valid")]
+		public int is_valid ();
+		[CCode (cname = "icalcomponent_isa")]
+		public iCal.ComponentKind isa ();
+		[CCode (cname = "icalcomponent_isa_component")]
+		public static int isa_component (void* component);
+		[CCode (cname = "icalcomponent_kind_is_valid")]
+		public static int kind_is_valid (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_kind_to_string")]
+		public static unowned string kind_to_string (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_merge_component")]
+		public void merge_component (iCal.Component  comp_to_merge);
+		[CCode (cname = "icalcomponent_remove_component")]
+		public void remove_component (iCal.Component  child);
+		[CCode (cname = "icalcomponent_remove_property")]
+		public void remove_property (iCal.Property property);
+		[CCode (cname = "icalcomponent_set_comment")]
+		public void set_comment (string v);
+		[CCode (cname = "icalcomponent_set_description")]
+		public void set_description (string v);
+		[CCode (cname = "icalcomponent_set_dtend")]
+		public void set_dtend (iCal.TimeType v);
+		[CCode (cname = "icalcomponent_set_dtstamp")]
+		public void set_dtstamp (iCal.TimeType v);
+		[CCode (cname = "icalcomponent_set_dtstart")]
+		public void set_dtstart (iCal.TimeType v);
+		[CCode (cname = "icalcomponent_set_due")]
+		public void set_due (iCal.TimeType v);
+		[CCode (cname = "icalcomponent_set_duration")]
+		public void set_duration (iCal.DurationType v);
+		[CCode (cname = "icalcomponent_set_location")]
+		public void set_location (string v);
+		[CCode (cname = "icalcomponent_set_method")]
+		public void set_method (iCal.PropertyMethod method);
+		[CCode (cname = "icalcomponent_set_parent")]
+		public void set_parent (iCal.Component  parent);
+		[CCode (cname = "icalcomponent_set_recurrenceid")]
+		public void set_recurrenceid (iCal.TimeType v);
+		[CCode (cname = "icalcomponent_set_relcalid")]
+		public void set_relcalid (string v);
+		[CCode (cname = "icalcomponent_set_sequence")]
+		public void set_sequence (int v);
+		[CCode (cname = "icalcomponent_set_status")]
+		public void set_status (iCal.PropertyStatus v);
+		[CCode (cname = "icalcomponent_set_summary")]
+		public void set_summary (string v);
+		[CCode (cname = "icalcomponent_set_uid")]
+		public void set_uid (string v);
+		[CCode (cname = "icalcomponent_string_to_kind")]
+		public static iCal.ComponentKind string_to_kind (string str);
+		[CCode (cname = "icalcomponent_strip_errors")]
+		public void strip_errors ();
+		[CCode (cname = "icalcomponent_new_vagenda", has_construct_function = false)]
+		public Component.vagenda ();
+		[CCode (cname = "icalcomponent_new_valarm", has_construct_function = false)]
+		public Component.valarm ();
+		[CCode (cname = "icalcomponent_vanew")]
+		public static unowned iCal.Component  vanew (iCal.ComponentKind kind);
+		[CCode (cname = "icalcomponent_new_vcalendar", has_construct_function = false)]
+		public Component.vcalendar ();
+		[CCode (cname = "icalcomponent_new_vevent", has_construct_function = false)]
+		public Component.vevent ();
+		[CCode (cname = "icalcomponent_new_vfreebusy", has_construct_function = false)]
+		public Component.vfreebusy ();
+		[CCode (cname = "icalcomponent_new_vjournal", has_construct_function = false)]
+		public Component.vjournal ();
+		[CCode (cname = "icalcomponent_new_vquery", has_construct_function = false)]
+		public Component.vquery ();
+		[CCode (cname = "icalcomponent_new_vtimezone", has_construct_function = false)]
+		public Component.vtimezone ();
+		[CCode (cname = "icalcomponent_new_vtodo", has_construct_function = false)]
+		public Component.vtodo ();
+		[CCode (cname = "icalcomponent_new_x", has_construct_function = false)]
+		public Component.x (string x_name);
+		[CCode (cname = "icalcomponent_new_xdaylight", has_construct_function = false)]
+		public Component.xdaylight ();
+		[CCode (cname = "icalcomponent_new_xstandard", has_construct_function = false)]
+		public Component.xstandard ();
+	}
+	[SimpleType]
+	[CCode (cheader_filename = "libical/ical.h", cname = "struct icaldurationtype", has_type_id = false)]
+	public struct DurationType {
+		public uint days;
+		public uint hours;
+		public int is_neg;
+		public uint minutes;
+		public uint seconds;
+		public uint weeks;
+		[CCode (cname = "icaldurationtype_as_ical_string")]
+		public unowned string as_ical_string ();
+		[CCode (cname = "icaldurationtype_as_ical_string_r")]
+		public unowned string as_ical_string_r ();
+		[CCode (cname = "icaldurationtype_as_int")]
+		public int as_int ();
+		[CCode (cname = "icaldurationtype_bad_duration")]
+		public static unowned iCal.DurationType bad_duration ();
+		[CCode (cname = "icaldurationtype_from_int")]
+		public static unowned iCal.DurationType from_int (int t);
+		[CCode (cname = "icaldurationtype_from_string")]
+		public static unowned iCal.DurationType from_string (string p1);
+		[CCode (cname = "icaldurationtype_is_bad_duration")]
+		public int is_bad_duration ();
+		[CCode (cname = "icaldurationtype_is_null_duration")]
+		public int is_null_duration ();
+		[CCode (cname = "icaldurationtype_null_duration")]
+		public static unowned iCal.DurationType null_duration ();
+	}
+	[CCode (cheader_filename = "libical/ical.h", copy_function = "icalparameter_new_clone", free_function = "icalparameter_free", cname = "icalparameter")]
+	[Compact]
+	public class Parameter {
+		[CCode (cname = "icalparameter_new", has_construct_function = false)]
+		public Parameter (iCal.ParameterKind kind);
+		[CCode (cname = "icalparameter_new_actionparam", has_construct_function = false)]
+		public Parameter.actionparam (iCal.ParameterAction v);
+		[CCode (cname = "icalparameter_new_altrep", has_construct_function = false)]
+		public Parameter.altrep (string v);
+		[CCode (cname = "icalparameter_as_ical_string")]
+		public unowned string as_ical_string ();
+		[CCode (cname = "icalparameter_as_ical_string_r")]
+		public unowned string as_ical_string_r ();
+		[CCode (cname = "icalparameter_new_charset", has_construct_function = false)]
+		public Parameter.charset (string v);
+		[CCode (cname = "icalparameter_new_clone", has_construct_function = false)]
+		public Parameter.clone (iCal.Parameter p);
+		[CCode (cname = "icalparameter_new_cn", has_construct_function = false)]
+		public Parameter.cn (string v);
+		[CCode (cname = "icalparameter_new_cutype", has_construct_function = false)]
+		public Parameter.cutype (iCal.ParameterCutype v);
+		[CCode (cname = "icalparameter_new_delegatedfrom", has_construct_function = false)]
+		public Parameter.delegatedfrom (string v);
+		[CCode (cname = "icalparameter_new_delegatedto", has_construct_function = false)]
+		public Parameter.delegatedto (string v);
+		[CCode (cname = "icalparameter_new_dir", has_construct_function = false)]
+		public Parameter.dir (string v);
+		[CCode (cname = "icalparameter_new_enable", has_construct_function = false)]
+		public Parameter.enable (iCal.ParameterEnable v);
+		[CCode (cname = "icalparameter_new_encoding", has_construct_function = false)]
+		public Parameter.encoding (iCal.ParameterEncoding v);
+		[CCode (cname = "icalparameter_enum_to_string")]
+		public static unowned string enum_to_string (int e);
+		[CCode (cname = "icalparameter_new_fbtype", has_construct_function = false)]
+		public Parameter.fbtype (iCal.ParameterFbType v);
+		[CCode (cname = "icalparameter_new_fmttype", has_construct_function = false)]
+		public Parameter.fmttype (string v);
+		[CCode (cname = "icalparameter_new_from_string", has_construct_function = false)]
+		public Parameter.from_string (string value);
+		[CCode (cname = "icalparameter_new_from_value_string", has_construct_function = false)]
+		public Parameter.from_value_string (iCal.ParameterKind kind, string value);
+		[CCode (cname = "icalparameter_get_actionparam")]
+		public iCal.ParameterAction get_actionparam ();
+		[CCode (cname = "icalparameter_get_altrep")]
+		public unowned string get_altrep ();
+		[CCode (cname = "icalparameter_get_charset")]
+		public unowned string get_charset ();
+		[CCode (cname = "icalparameter_get_cn")]
+		public unowned string get_cn ();
+		[CCode (cname = "icalparameter_get_cutype")]
+		public iCal.ParameterCutype get_cutype ();
+		[CCode (cname = "icalparameter_get_delegatedfrom")]
+		public unowned string get_delegatedfrom ();
+		[CCode (cname = "icalparameter_get_delegatedto")]
+		public unowned string get_delegatedto ();
+		[CCode (cname = "icalparameter_get_dir")]
+		public unowned string get_dir ();
+		[CCode (cname = "icalparameter_get_enable")]
+		public iCal.ParameterEnable get_enable ();
+		[CCode (cname = "icalparameter_get_encoding")]
+		public iCal.ParameterEncoding get_encoding ();
+		[CCode (cname = "icalparameter_get_fbtype")]
+		public iCal.ParameterFbType get_fbtype ();
+		[CCode (cname = "icalparameter_get_fmttype")]
+		public unowned string get_fmttype ();
+		[CCode (cname = "icalparameter_get_id")]
+		public unowned string get_id ();
+		[CCode (cname = "icalparameter_get_language")]
+		public unowned string get_language ();
+		[CCode (cname = "icalparameter_get_latency")]