Add gtkimage.h to includes, and remove gtkhtml headers Add and remove some

2004-11-23  Rodney Dawes  <dobey@novell.com>

	* gui/alarm-notify/alarm-notify-dialog.[ch]:
	Add gtkimage.h to includes, and remove gtkhtml headers
	Add and remove some widgets in the AlarmNotify struct
	(dialog_destroy_cb, delete_event_cb, close_clicked_cb):
	(snooze_clicked_cb, edit_clicked_cb, url_requested_cb):
	(make_html_display, write_times, write_html_heading):
	(alarm_notify_dialog_disable_buttons):
	Remove all these unneeded functions (no more GtkHTML in the dialog)
	(alarm_notify_dialog): Add description and location arguments
	Rename message argument to summary
	Update gtk-doc comment block to reflect API changes
	Clean up code to use gtk_dialog_run () and use a HIG compliant dialog

	* gui/alarm-notify/alarm-notify.glade: Update the alarm notify
	dialog to be HIG compliant and not use GtkHTML, and display more
	information that is relevant to the appointment we are alerting of

	* gui/alarm-notify/alarm-queue.c: Add new variables to the
	TrayIconData structure so we can access the description and location
	(on_dialog_objs_removed_cb): Remove alarm_dialog bits
	(notify_dialog_cb): Remove alarm_dialog bits
	(tray_icon_destroyed_cb): Free the description and location as well
	(open_alarm_dialog): alarm_notify_dialog does all the work now, we
	don't need to trap the dialog widget here
	(display_notification): Add code to get the description and location
	information from the cal component
	Avoid using an alarm component which has less useful API
	Fix a warning when creating the tray_icon widget

svn path=/trunk/; revision=27971

4 files changed, 430 insertions, 385 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index a84e13f66b..77c83520d9 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <gtk/gtkdialog.h>
+#include <gtk/gtkimage.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtksignal.h>
@@ -34,8 +35,6 @@
 #endif
 #include <glade/glade.h>
 #include <e-util/e-time-utils.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
 #include <libecal/e-cal-time-util.h>
 #include "alarm-notify-dialog.h"
 #include "config-data.h"
@@ -43,238 +42,28 @@
 #include <e-util/e-icon-factory.h>
 
 
-GtkWidget *make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow);
-
 /* The useful contents of the alarm notify dialog */
 typedef struct {
 	GladeXML *xml;
 
 	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
+	GtkWidget *title;
 	GtkWidget *snooze_time;
-	GtkWidget *html;
+	GtkWidget *description;
+	GtkWidget *location;
+	GtkWidget *start;
+	GtkWidget *end;
 
 	AlarmNotifyFunc func;
 	gpointer func_data;
 } AlarmNotify;
 
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_object_unref (an->xml);
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
-{
-
-	if (!strncmp ("file:///", url, strlen ("file:///"))) {
-		FILE *fp;
-		const char *filename = url + strlen ("file://");
-		char buf[4096];
-		size_t len;
-
-		fp = fopen (filename, "r");
-
-		if (fp == NULL) {
-			g_warning ("Error opening image: %s\n", url);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-			return;
-		}
-
-		while ((len = fread (buf, 1, sizeof(buf), fp)) > 0)
-			gtk_html_stream_write (stream, buf, len);
-
-		if (feof (fp)) {
-			fclose (fp);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-			return;
-		}
-
-		fclose (fp);
-	}
-
-	g_warning ("Error loading image");
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-	return;
-}
-
-GtkWidget *
-make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow)
-{
-	GtkWidget *html, *scrolled_window;
-
-	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
-
-	html = gtk_html_new();
-
-	gtk_html_set_default_content_type (GTK_HTML (html),
-					   "charset=utf-8");
-	gtk_html_load_empty (GTK_HTML (html));
-
-	g_signal_connect (html, "url_requested",
-			  G_CALLBACK (url_requested_cb),
-			  NULL);
+enum {
+        AN_RESPONSE_EDIT = 0,
+	AN_RESPONSE_SNOOZE = 1
+};
 
-	gtk_widget_pop_colormap();
-
-	scrolled_window = gtk_scrolled_window_new(NULL, NULL);
-
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
-				       GTK_POLICY_AUTOMATIC,
-				       GTK_POLICY_AUTOMATIC);
-
-
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-					     GTK_SHADOW_IN);
-
-	gtk_widget_set_size_request (scrolled_window, 300, 200);
-
-	gtk_container_add(GTK_CONTAINER (scrolled_window), html);
-
-	gtk_widget_show_all(scrolled_window);
-
-	g_object_set_data (G_OBJECT (scrolled_window), "html", html);
-	return scrolled_window;
-}
-
-static void
-write_times (GtkHTMLStream *stream, char *start, char *end)
-{
-	if (start)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Starting:"), start);
-	if (end)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Ending:"), end);
-
-}
-
-/* Creates a heading for the alarm notification dialog */
-static void
-write_html_heading (GtkHTMLStream *stream, const char *message,
-		    ECalComponentVType vtype, time_t occur_start, time_t occur_end)
-{
-	char *start, *end;
-	char *bg_path = "file://" EVOLUTION_IMAGESDIR "/bcg.png";
-	gchar *image_path;
-	gchar *icon_path;
-	icaltimezone *current_zone;
-
-	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
-	image_path = g_strdup_printf ("file://%s", icon_path);
-	g_free (icon_path);
-
-	/* Stringize the times */
-
-	current_zone = config_data_get_timezone ();
-
-	start = timet_to_str_with_zone (occur_start, current_zone);
-	end = timet_to_str_with_zone (occur_end, current_zone);
-
-	/* Write the header */
-
-	gtk_html_stream_printf (stream,
-				"<HTML><BODY background=\"%s\">"
-				"<TABLE WIDTH=\"100%%\">"
-				"<TR>"
-				"<TD><IMG SRC=\"%s\" ALIGN=\"top\" BORDER=\"0\"></TD>"
-				"<TD><H1>%s</H1></TD>"
-				"</TR>"
-				"</TABLE>",
-				bg_path,
-				image_path,
-				_("Evolution Alarm"));
-
-	gtk_html_stream_printf (stream, "<br><br><font size=\"+2\">%s</font><br><br>", message);
-
-	/* Write the times */
-
-	switch (vtype) {
-	case E_CAL_COMPONENT_EVENT:
-		write_times (stream, start, end);
-		break;
-
-	case E_CAL_COMPONENT_TODO:
-		write_times (stream, start, end);
-		break;
-
-	default:
-		/* Only VEVENTs and VTODOs can have alarms */
-		g_assert_not_reached ();
-		break;
-	}
-
-	g_free (start);
-	g_free (end);
-	g_free (image_path);
-}
+
 
 /**
  * alarm_notify_dialog:
@@ -282,7 +71,9 @@ write_html_heading (GtkHTMLStream *stream, const char *message,
  * @occur_start: Start of occurrence time for the event.
  * @occur_end: End of occurrence time for the event.
  * @vtype: Type of the component which corresponds to the alarm.
- * @message; Message to display in the dialog; usually comes from the component.
+ * @summary: Short summary of the appointment
+ * @description: Long description of the appointment
+ * @location: Location of the appointment
  * @func: Function to be called when a dialog action is invoked.
  * @func_data: Closure data for @func.
  *
@@ -291,23 +82,30 @@ write_html_heading (GtkHTMLStream *stream, const char *message,
  *
  * Return value: a pointer to the dialog structure if successful or NULL if an error occurs.
  **/
-gpointer
+void
 alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-		     ECalComponentVType vtype, const char *message,
+		     ECalComponentVType vtype, const char *summary,
+		     const char *description, const char *location,
 		     AlarmNotifyFunc func, gpointer func_data)
 {
 	AlarmNotify *an;
-	GtkHTMLStream *stream;
+	GtkWidget *image;
 	icaltimezone *current_zone;
-	char *buf, *title;
+	char *title;
+	char *start, *end;
+	char *icon_path;
 	GList *icon_list;
+	int snooze_timeout;
 
-	g_return_val_if_fail (trigger != -1, NULL);
+	g_return_if_fail (trigger != -1);
 
 	/* Only VEVENTs or VTODOs can have alarms */
-	g_return_val_if_fail (vtype == E_CAL_COMPONENT_EVENT || vtype == E_CAL_COMPONENT_TODO, NULL);
-	g_return_val_if_fail (message != NULL, NULL);
-	g_return_val_if_fail (func != NULL, NULL);
+	g_return_if_fail (vtype == E_CAL_COMPONENT_EVENT
+			  || vtype == E_CAL_COMPONENT_TODO);
+	g_return_if_fail (summary != NULL);
+	g_return_if_fail (description != NULL);
+	g_return_if_fail (location != NULL);
+	g_return_if_fail (func != NULL);
 
 	an = g_new0 (AlarmNotify, 1);
 
@@ -318,65 +116,56 @@ alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
 	if (!an->xml) {
 		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
 		g_free (an);
-		return NULL;
+		return;
 	}
 
 	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
+	an->title = glade_xml_get_widget (an->xml, "title-label");
 	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-	an->html = g_object_get_data (G_OBJECT (glade_xml_get_widget (an->xml, "frame")), "html");
+	an->description = glade_xml_get_widget (an->xml, "description-label");
+	an->location = glade_xml_get_widget (an->xml, "location-label");
+	an->start = glade_xml_get_widget (an->xml, "start-label");
+	an->end = glade_xml_get_widget (an->xml, "end-label");
 
-	if (!(an->dialog && an->close && an->snooze && an->edit
-	      && an->snooze_time)) {
+	if (!(an->dialog && an->title && an->snooze_time
+	      && an->description && an->location && an->start && an->end)) {
 		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
 		g_object_unref (an->xml);
 		g_free (an);
-		return NULL;
+		return;
 	}
 
 	gtk_widget_realize (an->dialog);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12);
 
-	g_signal_connect (G_OBJECT (an->dialog), "destroy",
-			  G_CALLBACK (dialog_destroy_cb),
-			  an);
+	image = glade_xml_get_widget (an->xml, "alarm-image");
+	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
+	gtk_image_set_from_file (GTK_IMAGE (image), icon_path);
+	g_free (icon_path);
 
 	/* Title */
 
-	current_zone = config_data_get_timezone ();
+	gtk_window_set_title (GTK_WINDOW (an->dialog), summary);
 
-	buf = timet_to_str_with_zone (trigger, current_zone);
-	title = g_strdup_printf (_("Alarm on %s"), buf);
-	g_free (buf);
+	/* Set the widget contents */
 
-	gtk_window_set_title (GTK_WINDOW (an->dialog), title);
+	title = g_strdup_printf ("<big><b>%s</b></big>", summary);
+	gtk_label_set_markup (GTK_LABEL (an->title), title);
 	g_free (title);
 
-	/* html heading */
-	stream = gtk_html_begin (GTK_HTML (an->html));
-	write_html_heading (stream, message, vtype, occur_start, occur_end);
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
+	gtk_label_set_text (GTK_LABEL (an->description), description);
+	gtk_label_set_text (GTK_LABEL (an->location), location);
 
-	/* Connect actions */
-
-	g_signal_connect (an->dialog, "delete_event",
-			  G_CALLBACK (delete_event_cb),
-			  an);
+	/* Stringize the times */
 
-	g_signal_connect (an->close, "clicked",
-			  G_CALLBACK (close_clicked_cb),
-			  an);
+	current_zone = config_data_get_timezone ();
 
-	g_signal_connect (an->snooze, "clicked",
-			  G_CALLBACK (snooze_clicked_cb),
-			  an);
+	start = timet_to_str_with_zone (occur_start, current_zone);
+	gtk_label_set_text (GTK_LABEL (an->start), start);
 
-	g_signal_connect (an->edit, "clicked",
-			  G_CALLBACK (edit_clicked_cb),
-			  an);
+	end = timet_to_str_with_zone (occur_end, current_zone);
+	gtk_label_set_text (GTK_LABEL (an->end), end);
 
 	/* Run! */
 
@@ -390,15 +179,20 @@ alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
 		g_list_free (icon_list);
 	}
 
-	gtk_widget_show (an->dialog);
-	return an;
-}
-
-void
-alarm_notify_dialog_disable_buttons (gpointer dialog)
-{
-	AlarmNotify *an = dialog;
-
-	gtk_widget_set_sensitive (an->snooze, FALSE);
-	gtk_widget_set_sensitive (an->edit, FALSE);
+	switch (gtk_dialog_run (GTK_DIALOG (an->dialog))) {
+	case AN_RESPONSE_EDIT:
+	  (* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
+	  break;
+	case AN_RESPONSE_SNOOZE:
+	  snooze_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
+	  (* an->func) (ALARM_NOTIFY_SNOOZE, snooze_timeout, an->func_data);
+	  break;
+	case GTK_RESPONSE_CLOSE:
+	case GTK_RESPONSE_DELETE_EVENT:
+	  break;
+	}
+	gtk_widget_destroy (an->dialog);
+	
+	g_object_unref (an->xml);
+	g_free (an);
 }
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 9bebce0a08..91861aaa99 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -35,10 +35,10 @@ typedef enum {
 
 typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
 
-gpointer alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
-			      ECalComponentVType vtype, const char *message,
-			      AlarmNotifyFunc func, gpointer func_data);
-void     alarm_notify_dialog_disable_buttons (gpointer dialog);
+void alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
+			  ECalComponentVType vtype, const char *summary,
+			  const char *description, const char *location,
+			  AlarmNotifyFunc func, gpointer func_data);
 
 
 #endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index 1d53234c3e..0302458aa3 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -5,10 +5,12 @@
 
 <widget class="GtkDialog" id="alarm-notify">
   <property name="visible">True</property>
-  <property name="title" translatable="yes"></property>
+  <property name="title" translatable="yes">Appointment</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">384</property>
+  <property name="default_height">200</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -19,18 +21,18 @@
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
+    <widget class="GtkVBox" id="dialog-vbox3">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	<widget class="GtkHButtonBox" id="dialog-action_area3">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="edit">
+	    <widget class="GtkButton" id="button3">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -39,7 +41,7 @@
 	      <property name="response_id">0</property>
 
 	      <child>
-		<widget class="GtkAlignment" id="alignment1">
+		<widget class="GtkAlignment" id="alignment2">
 		  <property name="visible">True</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
@@ -51,13 +53,13 @@
 		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox5">
+		    <widget class="GtkHBox" id="hbox6">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">2</property>
 
 		      <child>
-			<widget class="GtkImage" id="image1">
+			<widget class="GtkImage" id="image4">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">4</property>
@@ -74,9 +76,9 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="label5">
+			<widget class="GtkLabel" id="label16">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Edit appointment</property>
+			  <property name="label" translatable="yes">_Edit</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -101,16 +103,16 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="snooze">
+	    <widget class="GtkButton" id="button4">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">1</property>
 
 	      <child>
-		<widget class="GtkAlignment" id="alignment2">
+		<widget class="GtkAlignment" id="alignment3">
 		  <property name="visible">True</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
@@ -122,13 +124,13 @@
 		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox6">
+		    <widget class="GtkHBox" id="hbox7">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">2</property>
 
 		      <child>
-			<widget class="GtkImage" id="image2">
+			<widget class="GtkImage" id="image5">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">4</property>
@@ -145,7 +147,7 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="label6">
+			<widget class="GtkLabel" id="label17">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">_Snooze</property>
 			  <property name="use_underline">True</property>
@@ -172,7 +174,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="close">
+	    <widget class="GtkButton" id="button5">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -193,73 +195,48 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox2">
+	<widget class="GtkHBox" id="hbox2">
 	  <property name="border_width">12</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox3">
+	    <widget class="GtkImage" id="alarm-image">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox5">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="Custom" id="frame">
-		      <property name="visible">True</property>
-		      <property name="creation_function">make_html_display</property>
-		      <property name="int1">0</property>
-		      <property name="int2">0</property>
-		      <property name="last_modification_time">Thu, 11 Oct 2001 08:19:04 GMT</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
+	      <property name="stock">gtk-dialog-info</property>
+	      <property name="icon_size">6</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox4">
+	    <widget class="GtkVBox" id="vbox1">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
+	      <property name="spacing">12</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label4">
+		<widget class="GtkLabel" id="title-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Snooze _time (minutes):</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_CENTER</property>
+		  <property name="label" translatable="yes">Appointment Title</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">snooze-time</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -269,28 +246,287 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkSpinButton" id="snooze-time">
+		<widget class="GtkVBox" id="vbox2">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="climb_rate">1</property>
-		  <property name="digits">0</property>
-		  <property name="numeric">False</property>
-		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		  <property name="snap_to_ticks">False</property>
-		  <property name="wrap">False</property>
-		  <property name="adjustment">5 1 1440 1 5 5</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">12</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="description-label">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">description of appointment</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">True</property>
+		      <property name="selectable">True</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkTable" id="table1">
+		      <property name="visible">True</property>
+		      <property name="n_rows">4</property>
+		      <property name="n_columns">2</property>
+		      <property name="homogeneous">False</property>
+		      <property name="row_spacing">6</property>
+		      <property name="column_spacing">6</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label5">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Location:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label6">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Start time:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label7">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">End time:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="location-label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">location</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="start-label">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">start-time</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">True</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="end-label">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">end-time</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">True</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox5">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="snooze-time">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">5 1 60 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="minutes-label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">minutes</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options">fill</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label11">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Snooze _time:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">snooze-time</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 	</widget>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 0679d00f08..028cd8d00a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -699,7 +699,9 @@ edit_component (ECal *client, ECalComponent *comp)
 }
 
 typedef struct {
-	char *message;
+	char *summary;
+	char *description;
+	char *location;
 	gboolean blink_state;
 	gint blink_id;
 	time_t trigger;
@@ -730,8 +732,6 @@ on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data)
 			continue;
 
 		if (!strcmp (uid, our_uid)) {
-			if (tray_data->alarm_dialog)
-				alarm_notify_dialog_disable_buttons (tray_data->alarm_dialog);
 			tray_data->cqa = NULL;
 			tray_data->alarm_id = NULL;
 
@@ -767,7 +767,6 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
 		g_assert_not_reached ();
 	}
 
-	tray_data->alarm_dialog = NULL;
 	gtk_widget_destroy (tray_data->tray_icon);
 }
 
@@ -782,9 +781,19 @@ tray_icon_destroyed_cb (GtkWidget *tray, gpointer user_data)
 	if (tray_data->cqa != NULL)
 		remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, TRUE, TRUE);
 
-	if (tray_data->message != NULL) {
-		g_free (tray_data->message);
-		tray_data->message = NULL;
+	if (tray_data->summary != NULL) {
+		g_free (tray_data->summary);
+		tray_data->summary = NULL;
+	}
+
+	if (tray_data->description != NULL) {
+		g_free (tray_data->description);
+		tray_data->description = NULL;
+	}
+
+	if (tray_data->location != NULL) {
+		g_free (tray_data->location);
+		tray_data->location = NULL;
 	}
 
 	if (tray_data->blink_id)
@@ -806,19 +815,17 @@ open_alarm_dialog (TrayIconData *tray_data)
 {
 	QueuedAlarm *qa;
 
-	if (tray_data->alarm_dialog != NULL)
-		return FALSE;
-
 	qa = lookup_queued_alarm (tray_data->cqa, tray_data->alarm_id);
 	if (qa) {
 		gtk_widget_hide (tray_data->tray_icon);
-		tray_data->alarm_dialog = alarm_notify_dialog (
-			tray_data->trigger,
-			qa->instance->occur_start,
-			qa->instance->occur_end,
-			e_cal_component_get_vtype (tray_data->comp),
-			tray_data->message,
-			notify_dialog_cb, tray_data);
+		alarm_notify_dialog (tray_data->trigger,
+				     qa->instance->occur_start,
+				     qa->instance->occur_end,
+				     e_cal_component_get_vtype (tray_data->comp),
+				     tray_data->summary,
+				     tray_data->description,
+				     tray_data->location,
+				     notify_dialog_cb, tray_data);
 	}
 
 	return TRUE;
@@ -917,12 +924,12 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 {
 	QueuedAlarm *qa;
 	ECalComponent *comp;
-	const char *message;
-	ECalComponentAlarm *alarm;
+	const char *summary, *description, *location;
 	GtkWidget *tray_icon, *image, *ebox;
 	GtkTooltips *tooltips;
 	TrayIconData *tray_data;
 	ECalComponentText text;
+	GSList *text_list;
 	char *str, *start_str, *end_str, *alarm_str;
 	icaltimezone *current_zone;
 	GdkPixbuf *pixbuf;
@@ -933,26 +940,32 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 		return;
 	
 	/* get a sensible description for the event */
-	alarm = e_cal_component_get_alarm (comp, qa->instance->auid);
-	g_assert (alarm != NULL);
+	e_cal_component_get_summary (comp, &text);
 
-	e_cal_component_alarm_get_description (alarm, &text);
-	e_cal_component_alarm_free (alarm);
+	if (text.value)
+		summary = text.value;
+	else
+	        summary = _("No summary available.");
 
+	e_cal_component_get_description_list (comp, &text_list);
+
+	text = *((ECalComponentText *)text_list->data);
 	if (text.value)
-		message = text.value;
-	else {
-		e_cal_component_get_summary (comp, &text); 
- 		if (text.value)
- 			message = text.value;
- 		else
- 			message = _("No description available.");
-	}
+		description = text.value;
+	else
+	        description = _("No description available.");
+
+	e_cal_component_free_text_list (text_list);
+
+	e_cal_component_get_location (comp, &location);
+
+	if (!location)
+	        location = _("No location information available.");
 
 	/* create the tray icon */
 	tooltips = gtk_tooltips_new ();
 
-	tray_icon = egg_tray_icon_new (qa->instance->auid);
+	tray_icon = GTK_WIDGET (egg_tray_icon_new (qa->instance->auid));
 	pixbuf = e_icon_factory_get_icon  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
 	image = gtk_image_new_from_pixbuf (pixbuf);
 	gdk_pixbuf_unref (pixbuf);
@@ -966,7 +979,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	start_str = timet_to_str_with_zone (qa->instance->occur_start, current_zone);
 	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
 	str = g_strdup_printf (_("Alarm on %s\n%s\nStarting at %s\nEnding at %s"),
-			       alarm_str, message, start_str, end_str);
+			       alarm_str, summary, start_str, end_str);
 	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), ebox, str, str);
 	g_free (start_str);
 	g_free (end_str);
@@ -981,7 +994,9 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 
 	/* create the private structure */
 	tray_data = g_new0 (TrayIconData, 1);
-	tray_data->message = g_strdup (message);
+	tray_data->summary = g_strdup (summary);
+	tray_data->description = g_strdup (description);
+	tray_data->location = g_strdup (location);
 	tray_data->trigger = trigger;
 	tray_data->cqa = cqa;
 	tray_data->alarm_id = alarm_id;