shell-search-provider: Use GDateTime

This commit is contained in:
Georges Basile Stavracas Neto
2019-04-26 13:11:54 -03:00
parent 073fc961c1
commit 501ed25270
+8 -8
View File
@@ -31,7 +31,6 @@ typedef struct
{ {
GDBusMethodInvocation *invocation; GDBusMethodInvocation *invocation;
gchar **terms; gchar **terms;
icaltimetype date;
} PendingSearch; } PendingSearch;
struct _GcalShellSearchProvider struct _GcalShellSearchProvider
@@ -76,7 +75,9 @@ sort_event_data (GcalEvent *a,
static gboolean static gboolean
execute_search (GcalShellSearchProvider *self) execute_search (GcalShellSearchProvider *self)
{ {
icaltimezone *zone; g_autoptr (GDateTime) start = NULL;
g_autoptr (GDateTime) end = NULL;
g_autoptr (GDateTime) now = NULL;
g_autofree gchar *search_query = NULL; g_autofree gchar *search_query = NULL;
time_t range_start, range_end; time_t range_start, range_end;
guint i; guint i;
@@ -86,13 +87,12 @@ execute_search (GcalShellSearchProvider *self)
if (gcal_manager_get_loading (self->manager)) if (gcal_manager_get_loading (self->manager))
GCAL_RETURN (TRUE); GCAL_RETURN (TRUE);
zone = gcal_manager_get_system_timezone (self->manager); now = g_date_time_new_now_local ();
self->pending_search->date = icaltime_current_time_with_zone (zone); start = g_date_time_add_weeks (now, -1);
icaltime_adjust (&(self->pending_search->date), -7, 0, 0, 0); /* -1 weeks from today */ range_start = g_date_time_to_unix (start);
range_start = icaltime_as_timet_with_zone (self->pending_search->date, zone);
icaltime_adjust (&(self->pending_search->date), 21 * 2, 0, 0, 0); /* +3 weeks from today */ end = g_date_time_add_weeks (now, 3);
range_end = icaltime_as_timet_with_zone (self->pending_search->date, zone); range_end = g_date_time_to_unix (end);
gcal_manager_set_shell_search_subscriber (self->manager, E_CAL_DATA_MODEL_SUBSCRIBER (self), gcal_manager_set_shell_search_subscriber (self->manager, E_CAL_DATA_MODEL_SUBSCRIBER (self),
range_start, range_end); range_start, range_end);