diff options
| author | Federico Mena Quintero <federico@helixcode.com> | 2000-12-23 01:29:39 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-12-23 01:29:39 +0800 |
| commit | 4369c400fc801eef03a6fdda2b5256972f018246 (patch) | |
| tree | e6b3b8486921d9a155026b3a0e6f3d11c221596f /calendar/gui/e-day-view.c | |
| parent | 8acc182b76bc6987c140fb49e83405246d61d0e8 (diff) | |
| download | gsoc2013-evolution-4369c400fc801eef03a6fdda2b5256972f018246.tar.gz gsoc2013-evolution-4369c400fc801eef03a6fdda2b5256972f018246.tar.zst gsoc2013-evolution-4369c400fc801eef03a6fdda2b5256972f018246.zip | |
Alarm trigger queueing for the GUI part.
2000-12-21 Federico Mena Quintero <federico@helixcode.com>
Alarm trigger queueing for the GUI part.
* gui/alarm-notify.[ch]: New files with the high-level alarm
notification system; mostly moved over from gnome-cal.c. The
low-level timer stuff is still in alarm.[ch].
* gui/alarm-notify.c (alarm_notify_init): New function to
initialize the alarm notification system.
(alarm_notify_done): New function to shut down the alarm
notification system.
(alarm_notify_add_client): New function to start monitoring a
calendar client for alarm notification.
(alarm_notify_remove_client): New function to stop monitoring a
client.
* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so
the callback may know which ID is being destroyed.
* gui/alarm.c (clear_itimer): New function.
(pop_alarm): Use clear_itimer().
(alarm_done): New function to shut down the timer system.
(alarm_add): Add some preconditions. Do not call the destroy
notification function if we could not create the alarm.
(alarm_ready): Pass the alarm ID to the destroy notify function.
(alarm_remove): Likewise. Also, add some preconditions.
* gui/gnome-cal.c: Removed the alarm notification functions from
here since they are now in alarm-notify.c.
(gnome_calendar_construct): Register the client with
alarm_notify_add_client().
(gnome_calendar_destroy): Use alarm_notify_remove_client() to
unregister the client.
(obj_updated_cb): Do not do any alarm-related stuff.
(obj_removed_cb): Likewise.
* gui/main.c (main): Shut down the alarm timer system.
(main): Initialize and shut down the alarm notification system.
* gui/Makefile.am (evolution_calendar_SOURCES): Added
alarm-notify.[ch] to the list of sources.
* gui/calendar-model.c (calendar_model_set_cal_client): Only
connect to the "cal_loaded" signal if the client is not already
loaded.
* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.
* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.
* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"
before issuing the load request.
svn path=/trunk/; revision=7130
Diffstat (limited to 'calendar/gui/e-day-view.c')
| -rw-r--r-- | calendar/gui/e-day-view.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 861b2e04ad..9a2bd82732 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1449,8 +1449,10 @@ e_day_view_set_cal_client (EDayView *day_view, day_view->client = client; if (day_view->client) { - gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_loaded", - GTK_SIGNAL_FUNC (cal_loaded_cb), day_view); + if (!cal_client_is_loaded (day_view->client)) + gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_loaded", + GTK_SIGNAL_FUNC (cal_loaded_cb), day_view); + gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_updated", GTK_SIGNAL_FUNC (obj_updated_cb), day_view); gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_removed", |