diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 22c2d4f89a..8b21550e06 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-11-28 Wang Xin <jedy.wang@sun.com> + + Fix for bug #380064 + + * gui/alarm-notify/alarm-queue.c: (mail_notification): Only + popup the dialog if calendar backend does not support + email alarm. + 2006-12-03 Harish Krishnaswamy <kharish@novell.com> * gui/calendar-config.c: diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 08f1aadd48..d635eb6f74 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1696,6 +1696,10 @@ mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id) d(printf("%s:%d (mail_notification)\n",__FILE__, __LINE__)); + if (!e_cal_get_static_capability (cqa->parent_client->client, + CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS)) + return; + dialog = gtk_dialog_new_with_buttons (_("Warning"), NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_CANCEL, |