From b597fe284460110f74b30e225976ccf0590b4b9c Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@ximian.com>
Date: Thu, 20 Sep 2001 02:35:36 +0000
Subject: Display a notification message always, in addition to playing the
 sound.

2001-09-19  Federico Mena Quintero  <federico@ximian.com>

	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
	notification message always, in addition to playing the sound.
	(procedure_notification): Present a confirmation dialog before
	actually running the alarm's program.
	(procedure_notification): Use gnome_execute_shell() instead of
	gnome_execute_async() so that we handle multiple arguments
	properly.  Plus, it is most likely what the user expects.
	(mail_notification): Display a message about unsupported email
	reminders instead of blindly dropping the alarm.

	* gui/dialogs/alarm-options.glade: Added an explanatory message
	about mail alarms not being supported.

	* gui/dialogs/alarm-page.glade: Removed the "Send an email"
	option.

	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.

svn path=/trunk/; revision=13004
---
 calendar/gui/dialogs/alarm-options.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'calendar/gui/dialogs/alarm-options.glade')

diff --git a/calendar/gui/dialogs/alarm-options.glade b/calendar/gui/dialogs/alarm-options.glade
index ad0c181561..02c5d3f953 100644
--- a/calendar/gui/dialogs/alarm-options.glade
+++ b/calendar/gui/dialogs/alarm-options.glade
@@ -267,9 +267,9 @@ days
       <class>GtkLabel</class>
       <name>malarm-group</name>
       <visible>False</visible>
-      <label>FIXME: mail alarm options</label>
+      <label>This is an email reminder, but Evolution does not yet support this kind of reminders.  You will not be able to edit the options for this reminder.</label>
       <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
+      <wrap>True</wrap>
       <xalign>0.5</xalign>
       <yalign>0.5</yalign>
       <xpad>0</xpad>
-- 
cgit v1.2.3