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

window: attach update date timeout to window

Browse Source 
So we can properly remove the timeout source whenever the
window is finalized.

https://bugzilla.gnome.org/show_bug.cgi?id=781431
This commit is contained in:
Georges Basile Stavracas Neto
2017-04-18 09:55:56 -03:00
parent dff41ebef5
commit 141f8d87b8
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-window.c
+17 -12
View File
@@ -155,9 +155,11 @@ struct _GcalWindow
GtkWidget *calendar_popover; GtkWidget *calendar_popover;
GtkWidget *calendar_listbox; GtkWidget *calendar_listbox;
GtkWidget *source_dialog; GtkWidget *source_dialog;
gint refresh_timeout; gint refresh_timeout;
gint refresh_timeout_id; gint refresh_timeout_id;
gint open_edit_dialog_timeout_id; gint open_edit_dialog_timeout_id;
gint update_current_date_timeout_id;
/* temp to keep event_creation */ /* temp to keep event_creation */
gboolean open_edit_dialog; gboolean open_edit_dialog;
@@ -466,22 +468,18 @@ key_pressed (GtkWidget *widget,
} }
static gboolean static gboolean
update_current_date (GcalWindow *window) update_current_date (GcalWindow *self)
{ {
GCAL_ENTRY; GCAL_ENTRY;
/* FIXME: we end up here before constructed(), this shouldn't happen */ if (self->update_current_date_timeout_id == 0)
if (!window->views[GCAL_WINDOW_VIEW_WEEK]) self->update_current_date_timeout_id = g_timeout_add_seconds (60, (GSourceFunc) update_current_date, self);
GCAL_GOTO (out);
gtk_widget_queue_draw (window->views[GCAL_WINDOW_VIEW_WEEK]); gtk_widget_queue_draw (self->views[GCAL_WINDOW_VIEW_WEEK]);
gtk_widget_queue_draw (window->views[GCAL_WINDOW_VIEW_MONTH]); gtk_widget_queue_draw (self->views[GCAL_WINDOW_VIEW_MONTH]);
gtk_widget_queue_draw (window->views[GCAL_WINDOW_VIEW_YEAR]); gtk_widget_queue_draw (self->views[GCAL_WINDOW_VIEW_YEAR]);
out: GCAL_RETURN (G_SOURCE_CONTINUE);
g_timeout_add_seconds (60, (GSourceFunc) update_current_date, window);
GCAL_RETURN (G_SOURCE_REMOVE);
} }
static void static void
@@ -1256,6 +1254,12 @@ gcal_window_finalize (GObject *object)
window->open_edit_dialog_timeout_id = 0; window->open_edit_dialog_timeout_id = 0;
} }
if (window->update_current_date_timeout_id > 0)
{
g_source_remove (window->update_current_date_timeout_id);
window->update_current_date_timeout_id = 0;
}
/* If we have a queued event to delete, remove it now */ /* If we have a queued event to delete, remove it now */
if (window->event_to_delete) if (window->event_to_delete)
{ {
@@ -1331,7 +1335,6 @@ gcal_window_set_property (GObject *object,
gcal_year_view_set_manager (GCAL_YEAR_VIEW (self->year_view), self->manager); gcal_year_view_set_manager (GCAL_YEAR_VIEW (self->year_view), self->manager);
gcal_quick_add_popover_set_manager (GCAL_QUICK_ADD_POPOVER (self->quick_add_popover), self->manager); gcal_quick_add_popover_set_manager (GCAL_QUICK_ADD_POPOVER (self->quick_add_popover), self->manager);
gcal_source_dialog_set_manager (GCAL_SOURCE_DIALOG (self->source_dialog), self->manager); gcal_source_dialog_set_manager (GCAL_SOURCE_DIALOG (self->source_dialog), self->manager);
update_current_date (GCAL_WINDOW (object));
g_object_notify (object, "manager"); g_object_notify (object, "manager");
} }
@@ -1615,6 +1618,8 @@ gcal_window_init (GcalWindow *self)
gcal_window_add_accelerator (app, "win.change-view(1)", "<Ctrl>1") gcal_window_add_accelerator (app, "win.change-view(1)", "<Ctrl>1")
gcal_window_add_accelerator (app, "win.change-view(2)", "<Ctrl>2"); gcal_window_add_accelerator (app, "win.change-view(2)", "<Ctrl>2");
gcal_window_add_accelerator (app, "win.change-view(3)", "<Ctrl>3"); gcal_window_add_accelerator (app, "win.change-view(3)", "<Ctrl>3");
update_current_date (self);
} }
/* Public API */ /* Public API */