diff options
| author | JP Rosevear <jpr@ximian.com> | 2004-05-05 20:40:55 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-05-05 20:40:55 +0800 |
| commit | e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a (patch) | |
| tree | 4cc7fb63b1a9c8a4faeb67e552f56226e0f79e0d /calendar/gui/gnome-cal.c | |
| parent | ffdf0418892ce8051b35113b05f62047823ba363 (diff) | |
| download | gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar.gz gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar.bz2 gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar.lz gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar.xz gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.tar.zst gsoc2013-evolution-e4e1b710ddcc8b2189ff08ad8e4d91ec4b44fe9a.zip | |
Fixes #58025
2004-05-05 JP Rosevear <jpr@ximian.com>
Fixes #58025
* gui/gnome-cal.c (set_search_query): kill warning
(setup_config): don't set time out here
(setup_widgets): set it here
(gnome_calendar_destroy): clear the time out
* gui/e-tasks.c (search_bar_sexp_changed_cb): kill warning
(setup_config): don't set time out here
(setup_widgets): set it here and remember the time out id
(e_tasks_destroy): clear the time out
svn path=/trunk/; revision=25803
Diffstat (limited to 'calendar/gui/gnome-cal.c')
| -rw-r--r-- | calendar/gui/gnome-cal.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 800fa966df..df5002f65e 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -122,7 +122,7 @@ struct _GnomeCalendarPrivate { GList *dn_queries; /* list of CalQueries */ char *sexp; char *todo_sexp; - guint e_cal_view_timeout; + guint update_timeout; /* This is the view currently shown. We use it to keep track of the positions of the panes. range_selected is TRUE if a range of dates @@ -708,9 +708,7 @@ static void set_search_query (GnomeCalendar *gcal, const char *sexp) { GnomeCalendarPrivate *priv; - ECalModel *model; int i; - char *new_sexp = NULL; g_return_if_fail (gcal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -971,7 +969,6 @@ setup_config (GnomeCalendar *calendar) { GnomeCalendarPrivate *priv; guint not; - guint timeout_id = 0; priv = calendar->priv; @@ -998,9 +995,6 @@ setup_config (GnomeCalendar *calendar) calendar); priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not)); - /* Timeout check to hide completed items */ - timeout_id = g_timeout_add_full (G_PRIORITY_LOW, 60000, (GSourceFunc) update_todo_view_cb, calendar, NULL); - /* Pane positions */ priv->hpane_pos = calendar_config_get_hpane_pos (); priv->vpane_pos = calendar_config_get_vpane_pos (); @@ -1094,6 +1088,9 @@ setup_widgets (GnomeCalendar *gcal) g_signal_connect (etable, "selection_change", G_CALLBACK (table_selection_change_cb), gcal); + /* Timeout check to hide completed items */ + priv->update_timeout = g_timeout_add_full (G_PRIORITY_LOW, 60000, (GSourceFunc) update_todo_view_cb, gcal, NULL); + /* The Day View. */ priv->day_view = e_day_view_new (); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->day_view), gcal); @@ -1278,9 +1275,9 @@ gnome_calendar_destroy (GtkObject *object) priv->todo_sexp = NULL; } - if (priv->e_cal_view_timeout) { - g_source_remove (priv->e_cal_view_timeout); - priv->e_cal_view_timeout = 0; + if (priv->update_timeout) { + g_source_remove (priv->update_timeout); + priv->update_timeout = 0; } if (priv->view_instance) { |