diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-02-24 08:32:36 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-02-24 08:32:36 +0800 |
| commit | 06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a (patch) | |
| tree | 661fa622332869da7d7c6c2a7fef8162b14e93f6 /calendar/gui/alarm-notify/alarm-queue.c | |
| parent | 40d58afa7ce854ae8154a7f0ce32997f57d99ea4 (diff) | |
| download | gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar.gz gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar.bz2 gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar.lz gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar.xz gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.tar.zst gsoc2013-evolution-06c876bf8ee5f22fd5e9e60fb9dbc3cc06756c1a.zip | |
Switched to using our own refcounted structure for loaded clients.
2001-02-23 Federico Mena Quintero <federico@ximian.com>
* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):
Switched to using our own refcounted structure for loaded clients.
(AlarmNotify_removeCalendar): Ditto. Also, do the full
destruction of the client.
(alarm_notify_destroy): Destroy each element in the hash table.
* cal-client/cal-client.c (cal_client_construct): Test for
exceptions from OAF when activating the Wombat calendar factory.
* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:
New .oaf.in file.
* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.
* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here
instead of in a million files.
* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.
* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*
obsolete file.
* gui/Makefile.am (oaf_in_files): Updated.
svn path=/trunk/; revision=8375
Diffstat (limited to 'calendar/gui/alarm-notify/alarm-queue.c')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index e2f2ae88db..1e235c116d 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -286,13 +286,13 @@ load_alarms (ClientAlarms *ca) /* Called when a calendar client finished loading; we load its alarms */ static void -cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data) +cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data) { ClientAlarms *ca; ca = data; - if (status != CAL_CLIENT_LOAD_SUCCESS) + if (status != CAL_CLIENT_OPEN_SUCCESS) return; load_alarms (ca); @@ -463,16 +463,16 @@ alarm_queue_add_client (CalClient *client) ca->uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal); - if (!cal_client_is_loaded (client)) - gtk_signal_connect (GTK_OBJECT (client), "cal_loaded", - GTK_SIGNAL_FUNC (cal_loaded_cb), ca); + if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED) + gtk_signal_connect (GTK_OBJECT (client), "cal_opened", + GTK_SIGNAL_FUNC (cal_opened_cb), ca); gtk_signal_connect (GTK_OBJECT (client), "obj_updated", GTK_SIGNAL_FUNC (obj_updated_cb), ca); gtk_signal_connect (GTK_OBJECT (client), "obj_removed", GTK_SIGNAL_FUNC (obj_removed_cb), ca); - if (cal_client_is_loaded (client)) + if (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED) load_alarms (ca); } |