From e357c59b3b07fe144e56078562df1737374d2b7c Mon Sep 17 00:00:00 2001
From: Alfred Peng <alfred.peng@sun.com>
Date: Tue, 23 Mar 2004 09:38:27 +0000
Subject: get the mail alarm description message from "malarm_description"
 instead

2004-03-23  Alfred Peng <alfred.peng@sun.com>

        * gui/dialogs/alarm-options.c (malarm_widgets_to_alarm): get
        the mail alarm description message from "malarm_description"
        instead of "dalarm_description".

2004-03-23  Alfred Peng <alfred.peng@sun.com>

        * gui/alarm-notify/alarm-queue.c (audio_notification): If there
        is no attachment for a audio reminder, only a message window
        shows up.
        Get a beep sound even without attachment for audio reminder.

svn path=/trunk/; revision=25154
---
 calendar/gui/alarm-notify/alarm-queue.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'calendar/gui/alarm-notify')

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 85bc818f55..41088a3c7e 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1041,6 +1041,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 	ECalComponent *comp;
 	ECalComponentAlarm *alarm;
 	icalattach *attach;
+	int	flag = 0;
 
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -1058,12 +1059,15 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 
 		url = icalattach_get_url (attach);
 
-		if (url && *url && g_file_test (url, G_FILE_TEST_EXISTS))
+		if (url && *url && g_file_test (url, G_FILE_TEST_EXISTS)) {
+			flag = 1;
 			gnome_sound_play (url); /* this sucks */
-		else
-			gdk_beep ();
+		}
 	}
 
+	if (!flag)
+		gdk_beep ();
+
 	if (attach)
 		icalattach_unref (attach);
 
-- 
cgit