From e37627d16f5d85cef7e143b32764529ad109d178 Mon Sep 17 00:00:00 2001 From: Wang Xin Date: Mon, 4 Dec 2006 09:20:52 +0000 Subject: Fix for bug #380064 2006-11-28 Wang Xin Fix for bug #380064 * gui/alarm-notify/alarm-queue.c: (mail_notification): Only popup the dialog if calendar backend does not support email alarm. svn path=/trunk/; revision=33038 --- calendar/ChangeLog | 8 ++++++++ calendar/gui/alarm-notify/alarm-queue.c | 4 ++++ 2 files changed, 12 insertions(+) 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 + + 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 * 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, -- cgit v1.2.3