aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c131
2 files changed, 84 insertions, 60 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c5cee12e7d..e74ed0588b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2004-01-07 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/alarm-notify/alarm-queue.c: added an ECalQuery for each loaded
+ client.
+ (load_alarms): use a live query to the calendar instead of calling
+ e_cal_get_alarms_in_range().
+ (alarm_queue_add_client): set query initially to NULL.
+ (query_objects_changed_cb): renamed and made it manage both
+ "objects_added" and "objects_modified" signals of ECalView.
+ (query_objects_removed_cb): manage the "objects_removed" signal of
+ ECalView.
+ (alarm_queue_remove_client): unref the live query.
+
2004-01-06 JP Rosevear <jpr@ximian.com>
* gui/gnome-cal.c (gnome_calendar_add_event_source): remove the
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index e97761fc89..f7eba69688 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -69,6 +69,9 @@ typedef struct {
/* Monitored client */
ECal *client;
+ /* The live query to the calendar */
+ ECalView *query;
+
/* Hash table of component UID -> CompQueuedAlarms. If an element is
* present here, then it means its cqa->queued_alarms contains at least
* one queued alarm. When all the alarms for a component have been
@@ -119,6 +122,9 @@ static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer
static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);
+static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
+static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
+
/* Alarm queue engine */
@@ -374,19 +380,21 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
static void
load_alarms (ClientAlarms *ca, time_t start, time_t end)
{
- GSList *comp_alarms;
- GSList *l;
-
- comp_alarms = e_cal_get_alarms_in_range (ca->client, start, end);
-
- for (l = comp_alarms; l; l = l->next) {
- ECalComponentAlarms *alarms;
+ /* create the live query */
+ if (!ca->query) {
+ /* FIXME: handle errors */
+ if (!e_cal_get_query (ca->client, "(has-alarms?)", &ca->query, NULL)) {
+ g_warning (G_STRLOC ": Could not get query for client");
+ return;
+ }
- alarms = l->data;
- add_component_alarms (ca, alarms);
+ g_signal_connect (G_OBJECT (ca->query), "objects_added",
+ G_CALLBACK (query_objects_changed_cb), ca);
+ g_signal_connect (G_OBJECT (ca->query), "objects_modified",
+ G_CALLBACK (query_objects_changed_cb), ca);
+ g_signal_connect (G_OBJECT (ca->query), "objects_removed",
+ G_CALLBACK (query_objects_removed_cb), ca);
}
-
- g_slist_free (comp_alarms);
}
/* Loads today's remaining alarms for a client */
@@ -494,7 +502,7 @@ remove_comp (ClientAlarms *ca, const char *uid)
* alarms.
*/
static void
-obj_updated_cb (ECal *client, const char *uid, gpointer data)
+query_objects_changed_cb (ECal *client, GList *objects, gpointer data)
{
ClientAlarms *ca;
time_t now, day_end;
@@ -502,6 +510,7 @@ obj_updated_cb (ECal *client, const char *uid, gpointer data)
gboolean found;
icaltimezone *zone;
CompQueuedAlarms *cqa;
+ GList *l;
ca = data;
@@ -511,52 +520,57 @@ obj_updated_cb (ECal *client, const char *uid, gpointer data)
day_end = time_day_end_with_zone (now, zone);
- found = e_cal_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
-
- if (!found) {
- remove_comp (ca, uid);
- return;
- }
+ for (l = objects; l != NULL; l = l->next) {
+ const char *uid;
- cqa = lookup_comp_queued_alarms (ca, uid);
- if (!cqa)
- add_component_alarms (ca, alarms);
- else {
- GSList *l;
+ uid = icalcomponent_get_uid (l->data);
+ found = e_cal_get_alarms_for_object (ca->client, uid, now, day_end, &alarms);
- /* if already in the list, just update it */
- remove_alarms (cqa, FALSE);
- cqa->alarms = alarms;
- cqa->queued_alarms = NULL;
+ if (!found) {
+ remove_comp (ca, uid);
+ return;
+ }
- /* add the new alarms */
- for (l = cqa->alarms->alarms; l; l = l->next) {
- ECalComponentAlarmInstance *instance;
- gpointer alarm_id;
- QueuedAlarm *qa;
+ cqa = lookup_comp_queued_alarms (ca, uid);
+ if (!cqa)
+ add_component_alarms (ca, alarms);
+ else {
+ GSList *sl;
+
+ /* if already in the list, just update it */
+ remove_alarms (cqa, FALSE);
+ cqa->alarms = alarms;
+ cqa->queued_alarms = NULL;
+
+ /* add the new alarms */
+ for (sl = cqa->alarms->alarms; sl; sl = sl->next) {
+ ECalComponentAlarmInstance *instance;
+ gpointer alarm_id;
+ QueuedAlarm *qa;
+
+ instance = sl->data;
+
+ alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
+ if (!alarm_id) {
+ g_message ("obj_updated_cb(): Could not schedule a trigger for "
+ "%ld, discarding...", (long) instance->trigger);
+ continue;
+ }
- instance = l->data;
+ qa = g_new (QueuedAlarm, 1);
+ qa->alarm_id = alarm_id;
+ qa->instance = instance;
+ qa->snooze = FALSE;
- alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
- if (!alarm_id) {
- g_message ("obj_updated_cb(): Could not schedule a trigger for "
- "%ld, discarding...", (long) instance->trigger);
- continue;
+ cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
}
- qa = g_new (QueuedAlarm, 1);
- qa->alarm_id = alarm_id;
- qa->instance = instance;
- qa->snooze = FALSE;
-
- cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa);
+ if (cqa->queued_alarms == NULL) {
+ if (!cqa->expecting_update)
+ remove_comp (ca, uid);
+ } else
+ cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
}
-
- if (cqa->queued_alarms == NULL) {
- if (!cqa->expecting_update)
- remove_comp (ca, uid);
- } else
- cqa->queued_alarms = g_slist_reverse (cqa->queued_alarms);
}
}
@@ -564,13 +578,15 @@ obj_updated_cb (ECal *client, const char *uid, gpointer data)
* alarms.
*/
static void
-obj_removed_cb (ECal *client, const char *uid, gpointer data)
+query_objects_removed_cb (ECal *client, GList *objects, gpointer data)
{
ClientAlarms *ca;
+ GList *l;
ca = data;
- remove_comp (ca, uid);
+ for (l = objects; l != NULL; l = l->next)
+ remove_comp (ca, l->data);
}
@@ -701,14 +717,6 @@ typedef struct {
} TrayIconData;
static void
-on_dialog_obj_updated_cb (ECal *client, const char *uid, gpointer data)
-{
-/* commented out so gcc won't complain about the unused variable
- struct notify_dialog_closure *c = data;
-*/
-}
-
-static void
on_dialog_obj_removed_cb (ECal *client, const char *uid, gpointer data)
{
const char *our_uid;
@@ -1187,6 +1195,7 @@ alarm_queue_add_client (ECal *client)
ca = g_new (ClientAlarms, 1);
ca->client = client;
+ ca->query = NULL;
g_object_ref (ca->client);
g_hash_table_insert (client_alarms_hash, client, ca);
@@ -1269,6 +1278,8 @@ alarm_queue_remove_client (ECal *client)
g_signal_handlers_disconnect_matched (ca->client, G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, ca);
+ g_object_unref (ca->query);
+ ca->query = NULL;
g_object_unref (ca->client);
ca->client = NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 02:51:29 +0800