window: Use GcalRange in NewEventData
This commit is contained in:
committed by
Georges Basile Stavracas Neto
parent
b4000be398
commit
ff3a08ba95
+6
-12
@@ -82,8 +82,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
gint x;
|
gint x;
|
||||||
gint y;
|
gint y;
|
||||||
GDateTime *start_date;
|
GcalRange *range;
|
||||||
GDateTime *end_date;
|
|
||||||
} NewEventData;
|
} NewEventData;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
@@ -575,24 +574,20 @@ show_new_event_widget (GcalView *view,
|
|||||||
|
|
||||||
if (window->event_creation_data != NULL)
|
if (window->event_creation_data != NULL)
|
||||||
{
|
{
|
||||||
g_clear_pointer (&window->event_creation_data->start_date, g_date_time_unref);
|
g_clear_pointer (&window->event_creation_data->range, gcal_range_unref);
|
||||||
g_clear_pointer (&window->event_creation_data->end_date, g_date_time_unref);
|
|
||||||
g_clear_pointer (&window->event_creation_data, g_free);
|
g_clear_pointer (&window->event_creation_data, g_free);
|
||||||
}
|
}
|
||||||
|
|
||||||
window->event_creation_data = g_new0 (NewEventData, 1);
|
window->event_creation_data = g_new0 (NewEventData, 1);
|
||||||
window->event_creation_data->x = x;
|
window->event_creation_data->x = x;
|
||||||
window->event_creation_data->y = y;
|
window->event_creation_data->y = y;
|
||||||
window->event_creation_data->start_date = gcal_range_get_start (range);
|
window->event_creation_data->range = gcal_range_ref (range);
|
||||||
window->event_creation_data->end_date = gcal_range_get_end (range);
|
|
||||||
|
|
||||||
g_debug ("Quick add popover position (%f, %f)", x, y);
|
g_debug ("Quick add popover position (%f, %f)", x, y);
|
||||||
|
|
||||||
/* Setup the quick add popover's dates */
|
/* Setup the quick add popover's dates */
|
||||||
gcal_quick_add_popover_set_date_start (GCAL_QUICK_ADD_POPOVER (window->quick_add_popover),
|
gcal_quick_add_popover_set_range (GCAL_QUICK_ADD_POPOVER (window->quick_add_popover),
|
||||||
window->event_creation_data->start_date);
|
window->event_creation_data->range);
|
||||||
gcal_quick_add_popover_set_date_end (GCAL_QUICK_ADD_POPOVER (window->quick_add_popover),
|
|
||||||
window->event_creation_data->end_date);
|
|
||||||
|
|
||||||
/* Position and place the quick add popover */
|
/* Position and place the quick add popover */
|
||||||
if (!gtk_widget_compute_point (window->views[window->active_view],
|
if (!gtk_widget_compute_point (window->views[window->active_view],
|
||||||
@@ -805,8 +800,7 @@ gcal_window_finalize (GObject *object)
|
|||||||
|
|
||||||
if (window->event_creation_data)
|
if (window->event_creation_data)
|
||||||
{
|
{
|
||||||
g_clear_pointer (&window->event_creation_data->start_date, g_date_time_unref);
|
g_clear_pointer (&window->event_creation_data->range, gcal_range_unref);
|
||||||
g_clear_pointer (&window->event_creation_data->end_date, g_date_time_unref);
|
|
||||||
g_clear_pointer (&window->event_creation_data, g_free);
|
g_clear_pointer (&window->event_creation_data, g_free);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user