--- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api	2006-01-11 14:21:50.000000000 -0500
+++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c	2006-01-11 14:36:01.000000000 -0500
@@ -1457,12 +1457,12 @@
 	const char *summary, *location;
 	GtkTooltips *tooltips;
 	ECalComponentText text;
-	char *str, *start_str, *end_str, *alarm_str, *time_str;
+	char *start_str, *end_str, *alarm_str, *time_str;
 	icaltimezone *current_zone;
 	ECalComponentOrganizer organiser;
-	NotifyIcon *icon;
-	char *filename;
+	char *icon_filename;
 	char *body;
+	NotifyNotification *notification;
 	
 	comp = cqa->alarms->comp;
 	qa = lookup_queued_alarm (cqa, alarm_id);
@@ -1470,9 +1470,7 @@
 		return;
 	if (!notify_is_initted ())
 		notify_init("Evolution Alarm Notify");
-	filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
-	icon = notify_icon_new_from_uri (filename);
-	g_free (filename);
+	icon_filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
 	
 	/* get a sensible description for the event */
 	e_cal_component_get_summary (comp, &text);
@@ -1495,9 +1493,6 @@
 	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
 	time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
 
-	str = g_strdup_printf ("%s %s",
-			       start_str, time_str);
-
 	if (organiser.cn) {
 		if (location)
 			body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
@@ -1508,28 +1503,22 @@
 		if (location)
 			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
 		else
-			body = g_strdup_printf ("%s %s", start_str, time_str);			
-}
+		        body = g_strdup_printf ("%s %s", start_str, time_str);			
+	}
 
-	if (!notify_send_notification (
-					NULL, "device", NOTIFY_URGENCY_NORMAL,
-					summary,
-					body, 	/* body text */
-					icon,			/* icon */
-					TRUE, 0,		/* expiry, server default */
-					NULL,			/* hints */
-					NULL,			/* no user_data */
-					0))			/* no actions */
-					g_warning ("Could not send notification to daemon\n");	
+	notification = notify_notification_new (summary,
+						body,
+						icon_filename,
+						NULL);
+	if (!notify_notification_show_and_forget (notification, NULL))
+	        g_warning ("Error showing notification\n");
 
-	/* create the private structure */
+	g_free (icon_filename);
+	g_free (body);
 	g_free (start_str);
 	g_free (end_str);
 	g_free (alarm_str);
 	g_free (time_str);
-	g_free (str);
-
-
 }
 #endif
 
