Merge lp:~tintou/maya/maya-timezone into lp:~elementary-apps/maya/trunk

[Corentin Noël]

Fix the creation of events with the right TimeZone.

Fix the all-day creation of events and fixes the wrong TimeZone for Online Calendars.

[lp:~tintou/maya/maya-timezone]

605. By Corentin Noël on 2014-07-23

Fixed other Utils functions to use TimeZone.

[Steffen Schuhmann (sschuhmann)]

Working with my Google Calendar

review: Approve

=== modified file 'core/Utils.vala'
--- core/Utils.vala	2014-07-05 13:23:05 +0000
+++ core/Utils.vala	2014-07-23 14:21:25 +0000
@@ -43,14 +43,23 @@
      * Converts two datetimes to one TimeType. The first contains the date,
      * its time settings are ignored. The second one contains the time itself.
      */
-    public iCal.TimeType date_time_to_ical (DateTime date, DateTime time) {
+    public iCal.TimeType date_time_to_ical (DateTime date, DateTime? time) {
 
-        iCal.TimeType result = iCal.TimeType.from_day_of_year
+        var result = iCal.TimeType.from_day_of_year
             (date.get_day_of_year (), date.get_year ());
+        result.zone = iCal.TimeZone.get_builtin_timezone (E.Cal.util_get_system_timezone_location ());
 
-        result.hour = time.get_hour ();
-        result.minute = time.get_minute ();
-        result.second = time.get_second ();
+        if (time != null) {
+            result.is_date = 0;
+            result.hour = time.get_hour ();
+            result.minute = time.get_minute ();
+            result.second = time.get_second ();
+        } else {
+            result.is_date = 1;
+            result.hour = 0;
+            result.minute = 0;
+            result.second = 0;
+        }
 
         return result;
     }
@@ -68,7 +77,8 @@
     }
 
     public DateTime ecal_to_date_time (E.CalComponentDateTime date) {
-        DateTime result = new DateTime(new TimeZone.local(), 
+        TimeZone zone = new TimeZone (date.tzid);
+        DateTime result = new DateTime(zone, 
                 date.value.year, date.value.month, date.value.day, 
                 date.value.hour, date.value.minute, date.value.second);
 
@@ -107,16 +117,16 @@
             var rrule = property.get_rrule ();
             switch (rrule.freq) {
                 case (iCal.RecurrenceTypeFrequency.WEEKLY):
-                    generate_week_reccurence (ref dateranges, view_range, rrule, start, end);
+                    generate_week_reccurence (dateranges, view_range, rrule, start, end);
                     break;
                 case (iCal.RecurrenceTypeFrequency.MONTHLY):
-                    generate_month_reccurence (ref dateranges, view_range, rrule, start, end);
+                    generate_month_reccurence (dateranges, view_range, rrule, start, end);
                     break;
                 case (iCal.RecurrenceTypeFrequency.YEARLY):
-                    generate_year_reccurence (ref dateranges, view_range, rrule, start, end);
+                    generate_year_reccurence (dateranges, view_range, rrule, start, end);
                     break;
                 default:
-                    generate_day_reccurence (ref dateranges, view_range, rrule, start, end);
+                    generate_day_reccurence (dateranges, view_range, rrule, start, end);
                     break;
             }
         }
@@ -124,7 +134,7 @@
         return dateranges;
     }
 
-    private void generate_day_reccurence (ref Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+    private void generate_day_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
                                            iCal.RecurrenceType rrule, DateTime start, DateTime end) {
         if (rrule.until.is_null_time () == 0) {
             for (int i = 1; i <= (int)(rrule.until.day/rrule.interval); i++) {
@@ -149,7 +159,7 @@
         }
     }
 
-    private void generate_year_reccurence (ref Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+    private void generate_year_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
                                            iCal.RecurrenceType rrule, DateTime start, DateTime end) {
         if (rrule.until.is_null_time () == 0) {
             /*for (int i = 0; i <= rrule.until.year; i++) {
@@ -186,7 +196,7 @@
         }
     }
 
-    private void generate_month_reccurence (ref Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+    private void generate_month_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
                                            iCal.RecurrenceType rrule, DateTime start, DateTime end) {
         for (int k = 0; k <= iCal.Size.BY_DAY; k++) {
             if (rrule.by_day[k] < iCal.Size.BY_DAY) {
@@ -214,7 +224,6 @@
                         }
 
                         int interval = start_ical_day.get_day_of_month () - start.get_day_of_month ();
-                        warning ("%d", start_ical_day.get_day_of_month ());
                         dateranges.add (new Util.DateRange (start_ical_day, strip_time(end).add_months (n).add_days (interval)));
                         i++;
                         n = i*rrule.interval;
@@ -256,7 +265,7 @@
         }
     }
 
-    private void generate_week_reccurence (ref Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
+    private void generate_week_reccurence (Gee.LinkedList<DateRange> dateranges, Util.DateRange view_range,
                                            iCal.RecurrenceType rrule, DateTime start_, DateTime end_) {
         DateTime start = start_;
         DateTime end = end_;
@@ -678,7 +687,6 @@
     }
 
     public Gtk.Widget set_margins (Gtk.Widget widget, int top, int right, int bottom, int left) {
-
         widget.margin_top = top;
         widget.margin_right = right;
         widget.margin_bottom = bottom;
@@ -688,7 +696,6 @@
     }
 
     public Gtk.Alignment set_paddings (Gtk.Widget widget, int top, int right, int bottom, int left) {
-
         var alignment = new Gtk.Alignment (0.0f, 0.0f, 1.0f, 1.0f);
         alignment.top_padding = top;
         alignment.right_padding = right;

=== modified file 'src/EventEdition/InfoPanel.vala'
--- src/EventEdition/InfoPanel.vala	2014-07-06 14:43:57 +0000
+++ src/EventEdition/InfoPanel.vala	2014-07-23 14:21:25 +0000
@@ -156,11 +156,8 @@
 
         // Save the time
         if (allday_switch.get_active () == true) {
-            iCal.TimeType dt_start = Util.date_time_to_ical (from_date_picker.date, new DateTime.local (2000, 12, 12, 0, 0, 0));
-            iCal.TimeType dt_end = Util.date_time_to_ical (to_date_picker.date.add_days (1), new DateTime.local (2000, 12, 12, 0, 0, 0));
-
-            dt_start.is_date = 0;
-            dt_end.is_date = 0;
+            iCal.TimeType dt_start = Util.date_time_to_ical (from_date_picker.date, null);
+            iCal.TimeType dt_end = Util.date_time_to_ical (to_date_picker.date.add_days (1), null);
 
             comp.set_dtstart (dt_start);
             comp.set_dtend (dt_end);
@@ -168,9 +165,6 @@
             iCal.TimeType dt_start = Util.date_time_to_ical (from_date_picker.date, from_time_picker.time);
             iCal.TimeType dt_end = Util.date_time_to_ical (to_date_picker.date, to_time_picker.time);
 
-            dt_start.is_date = 0;
-            dt_end.is_date = 0;
-
             comp.set_dtstart (dt_start);
             comp.set_dtend (dt_end);
         }