summaryrefslogtreecommitdiff
path: root/src/events/EventsBranch.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-28 21:35:52 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-28 21:35:52 +0200
commitb86540b743f1a87a163ffb811c8fe22a01fefa38 (patch)
treeb47cb3bb83c2377234226fb3987ab3320a987dd9 /src/events/EventsBranch.vala
parentac6e0b731b9f0b2efd392e3309a5c07e2a66adad (diff)
parente905d8e16eec152d19797937f13ba3cf4b8f8aca (diff)
Merge branch 'release/debian/0.32.1-1'debian/0.32.1-1
Diffstat (limited to 'src/events/EventsBranch.vala')
-rw-r--r--src/events/EventsBranch.vala40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/events/EventsBranch.vala b/src/events/EventsBranch.vala
index 097a664..0550eb7 100644
--- a/src/events/EventsBranch.vala
+++ b/src/events/EventsBranch.vala
@@ -133,8 +133,8 @@ public class Events.Branch : Sidebar.Branch {
b = swap;
}
- int64 result = ((Events.EventEntry) a).get_event().get_start_time()
- - ((Events.EventEntry) b).get_event().get_start_time();
+ int64 result = nullsafe_date_time_comperator(((Events.EventEntry) a).get_event().get_start_time(),
+ ((Events.EventEntry) b).get_event().get_start_time());
// to stabilize sort (events with the same start time are allowed)
if (result == 0) {
@@ -215,14 +215,14 @@ public class Events.Branch : Sidebar.Branch {
}
private void add_event(Event event) {
- time_t event_time = event.get_start_time();
- if (event_time == 0) {
+ DateTime? event_time = event.get_start_time();
+ if (event_time == null) {
add_undated_event(event);
return;
}
- Time event_tm = Time.local(event_time);
+ var event_tm = event_time.to_local();
Sidebar.Entry? year;
Sidebar.Entry? month = find_event_month(event, event_tm, out year);
@@ -246,14 +246,14 @@ public class Events.Branch : Sidebar.Branch {
}
private void move_event(Event event) {
- time_t event_time = event.get_start_time();
- if (event_time == 0) {
+ DateTime? event_time = event.get_start_time();
+ if (event_time == null) {
move_to_undated_event(event);
return;
}
- Time event_tm = Time.local(event_time);
+ var event_tm = event_time.to_local();
Sidebar.Entry? year;
Sidebar.Entry? month = find_event_month(event, event_tm, out year);
@@ -296,13 +296,13 @@ public class Events.Branch : Sidebar.Branch {
}
}
- private Sidebar.Entry? find_event_month(Event event, Time event_tm, out Sidebar.Entry found_year) {
+ private Sidebar.Entry? find_event_month(Event event, DateTime event_tm, out Sidebar.Entry found_year) {
// find the year first
found_year = find_event_year(event, event_tm);
if (found_year == null)
return null;
- int event_month = event_tm.month + 1;
+ int event_month = event_tm.get_month();
// found the year, traverse the months
return find_first_child(found_year, (entry) => {
@@ -310,8 +310,8 @@ public class Events.Branch : Sidebar.Branch {
});
}
- private Sidebar.Entry? find_event_year(Event event, Time event_tm) {
- int event_year = event_tm.year + 1900;
+ private Sidebar.Entry? find_event_year(Event event, DateTime event_tm) {
+ int event_year = event_tm.get_year();
return find_first_child(get_root(), (entry) => {
if ((entry is Events.UndatedDirectoryEntry) || (entry is Events.NoEventEntry) ||
@@ -400,9 +400,9 @@ public class Events.MasterDirectoryEntry : Events.DirectoryEntry {
public class Events.YearDirectoryEntry : Events.DirectoryEntry {
private string name;
- private Time tm;
+ private DateTime tm;
- public YearDirectoryEntry(string name, Time tm) {
+ public YearDirectoryEntry(string name, DateTime tm) {
this.name = name;
this.tm = tm;
}
@@ -412,7 +412,7 @@ public class Events.YearDirectoryEntry : Events.DirectoryEntry {
}
public int get_year() {
- return tm.year + 1900;
+ return tm.get_year();
}
protected override Page create_page() {
@@ -422,9 +422,9 @@ public class Events.YearDirectoryEntry : Events.DirectoryEntry {
public class Events.MonthDirectoryEntry : Events.DirectoryEntry {
private string name;
- private Time tm;
+ private DateTime tm;
- public MonthDirectoryEntry(string name, Time tm) {
+ public MonthDirectoryEntry(string name, DateTime tm) {
this.name = name;
this.tm = tm;
}
@@ -434,11 +434,11 @@ public class Events.MonthDirectoryEntry : Events.DirectoryEntry {
}
public int get_year() {
- return tm.year + 1900;
+ return tm.get_year();
}
public int get_month() {
- return tm.month + 1;
+ return tm.get_month();
}
protected override Page create_page() {
@@ -456,7 +456,7 @@ public class Events.UndatedDirectoryEntry : Events.DirectoryEntry {
protected override Page create_page() {
return new SubEventsDirectoryPage(SubEventsDirectoryPage.DirectoryType.UNDATED,
- Time.local(0));
+ new DateTime.now_local());
}
}