Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

search/hit-event: Compare calendars too

Browse Source 
This allows not mixing up similar events from different calendars.
This commit is contained in:
Georges Basile Stavracas Neto
2023-03-16 09:28:30 -03:00
parent 5dd98ea01c
commit 6b57c459a3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/search/gcal-search-hit-event.c
+11 -1
View File
@@ -105,9 +105,12 @@ static gint
gcal_search_hit_event_compare (GcalSearchHit *a, gcal_search_hit_event_compare (GcalSearchHit *a,
GcalSearchHit *b) GcalSearchHit *b)
{ {
GcalCalendar *calendar_a;
GcalCalendar *calendar_b;
GcalEvent *event_a; GcalEvent *event_a;
GcalEvent *event_b; GcalEvent *event_b;
time_t now_utc; time_t now_utc;
gint result;
g_assert (GCAL_IS_SEARCH_HIT_EVENT (a)); g_assert (GCAL_IS_SEARCH_HIT_EVENT (a));
g_assert (GCAL_IS_SEARCH_HIT_EVENT (b)); g_assert (GCAL_IS_SEARCH_HIT_EVENT (b));
@@ -116,7 +119,14 @@ gcal_search_hit_event_compare (GcalSearchHit *a,
event_b = GCAL_SEARCH_HIT_EVENT (b)->event; event_b = GCAL_SEARCH_HIT_EVENT (b)->event;
now_utc = time (NULL); now_utc = time (NULL);
return -gcal_event_compare_with_current (event_a, event_b, now_utc); result = -gcal_event_compare_with_current (event_a, event_b, now_utc);
if (result != 0)
return result;
calendar_a = gcal_event_get_calendar (event_a);
calendar_b = gcal_event_get_calendar (event_b);
return g_strcmp0 (gcal_calendar_get_name (calendar_b), gcal_calendar_get_name (calendar_a));
} }