[california] Miscellaneous fixes
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california] Miscellaneous fixes
- Date: Wed, 18 Jun 2014 21:35:45 +0000 (UTC)
commit 7b12358836aa2b9266c8ebf5733688b114276738
Author: Jim Nelson <jim yorba org>
Date: Wed Jun 18 14:35:33 2014 -0700
Miscellaneous fixes
src/calendar/calendar-olson-zone.vala | 7 ++++++-
src/component/component-date-time.vala | 2 ++
vapi/libical.vapi | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/calendar/calendar-olson-zone.vala b/src/calendar/calendar-olson-zone.vala
index e97d04d..2d63da0 100644
--- a/src/calendar/calendar-olson-zone.vala
+++ b/src/calendar/calendar-olson-zone.vala
@@ -46,7 +46,12 @@ public class OlsonZone : BaseObject {
*/
public string value { get; private set; }
- public OlsonZone(string area_location) {
+ /**
+ * Create an { link OlsonZone} for the specified area location.
+ *
+ * Passing null or an empty string results in an OlsonZone for { link UTC}.
+ */
+ public OlsonZone(string? area_location) {
value = !String.is_empty(area_location) ? area_location : UTC;
}
diff --git a/src/component/component-date-time.vala b/src/component/component-date-time.vala
index f8121a5..546e807 100644
--- a/src/component/component-date-time.vala
+++ b/src/component/component-date-time.vala
@@ -109,6 +109,8 @@ public class DateTime : BaseObject, Gee.Hashable<DateTime>, Gee.Comparable<DateT
zone = new Calendar.OlsonZone(tz.get_location());
else
zone = new Calendar.OlsonZone(param.get_tzid());
+ } else if (dt.zone != null) {
+ zone = new Calendar.OlsonZone(dt.zone->get_location());
}
kind = ical_prop_kind;
diff --git a/vapi/libical.vapi b/vapi/libical.vapi
index c583a74..837687e 100644
--- a/vapi/libical.vapi
+++ b/vapi/libical.vapi
@@ -2468,7 +2468,7 @@ namespace iCal {
[CCode (cheader_filename = "libical/ical.h", cname = "icalenum_reqstat_minor")]
public static short icalenum_reqstat_minor (iCal.icalrequeststatus stat);
[CCode (cheader_filename = "libical/ical.h", cname = "icalerrno_return")]
- public static iCal.icalerrorenum icalerrno_return ();
+ public static iCal.icalerrorenum* icalerrno_return ();
[CCode (cheader_filename = "libical/ical.h", cname = "icalerror_clear_errno")]
public static void icalerror_clear_errno ();
[CCode (cheader_filename = "libical/ical.h", cname = "icalerror_crash_here")]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]