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

application: Use GDateTime instead of icaltime

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-25 16:30:57 -03:00
parent 506f0c110e
commit aa82567f98
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-application.c
+21 -17
View File
@@ -259,13 +259,10 @@ gcal_application_activate (GApplication *application)
{ {
if (!self->initial_date) if (!self->initial_date)
{ {
icaltimezone *tz; g_autoptr (GDateTime) now = NULL;
tz = gcal_manager_get_system_timezone (manager); now = g_date_time_new_now_local ();
self->initial_date = datetime_to_icaltime (now);
self->initial_date = g_new0 (icaltimetype, 1);
*self->initial_date = icaltime_current_time_with_zone (tz);
*self->initial_date = icaltime_set_timezone (self->initial_date, tz);
} }
self->window = g_object_new (GCAL_TYPE_WINDOW, self->window = g_object_new (GCAL_TYPE_WINDOW,
@@ -329,9 +326,9 @@ static gint
gcal_application_command_line (GApplication *app, gcal_application_command_line (GApplication *app,
GApplicationCommandLine *command_line) GApplicationCommandLine *command_line)
{ {
g_autoptr (GVariant) option = NULL;
GcalApplication *self; GcalApplication *self;
GVariantDict *options; GVariantDict *options;
GVariant *option;
const gchar* date = NULL; const gchar* date = NULL;
const gchar* uuid = NULL; const gchar* uuid = NULL;
gsize length; gsize length;
@@ -353,8 +350,6 @@ gcal_application_command_line (GApplication *app,
uuid = g_variant_get_string (option, &length); uuid = g_variant_get_string (option, &length);
gcal_application_set_uuid (GCAL_APPLICATION (app), uuid); gcal_application_set_uuid (GCAL_APPLICATION (app), uuid);
g_variant_unref (option);
} }
else if (g_variant_dict_contains (options, "date")) else if (g_variant_dict_contains (options, "date"))
{ {
@@ -365,16 +360,25 @@ gcal_application_command_line (GApplication *app,
if (e_time_parse_date_and_time (date, &result) == E_TIME_PARSE_OK) if (e_time_parse_date_and_time (date, &result) == E_TIME_PARSE_OK)
{ {
GcalManager *manager = gcal_context_get_manager (self->context); g_autoptr (GDateTime) initial_date = NULL;
if (!self->initial_date)
self->initial_date = g_new0 (icaltimetype, 1);
*self->initial_date = tm_to_icaltimetype (&result, FALSE); initial_date = g_date_time_new (gcal_context_get_timezone (self->context),
*self->initial_date = icaltime_set_timezone (self->initial_date, result.tm_year,
gcal_manager_get_system_timezone (manager)); result.tm_mon,
result.tm_mday,
result.tm_hour,
result.tm_min,
0);
g_clear_pointer (&self->initial_date, g_free);
if (initial_date)
self->initial_date = datetime_to_icaltime (initial_date);
}
else
{
g_warning ("Date %s is invalid", date);
} }
g_variant_unref (option);
} }
g_application_activate (app); g_application_activate (app);