Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1274.2.6
diff -u -r1.1274.2.6 ChangeLog
--- ChangeLog	2001/12/03 22:59:19	1.1274.2.6
+++ ChangeLog	2001/12/05 15:36:06
@@ -1,3 +1,10 @@
+2001-12-05  Rodrigo Moya <rodrigo@ximian.com>
+
+	* gui/dialogs/event-page.glade: added entry for the LOCATION field
+
+	* gui/dialogs/event-page.c: added support for the new LOCATION entry
+	added in the Event editor.
+
 2001-12-03  Damon Chaplin  <damon@ximian.com>
 
 	* gui/e-meeting-model.c: 
Index: gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.32
diff -u -r1.32 event-page.c
--- gui/dialogs/event-page.c	2001/11/06 00:02:47	1.32
+++ gui/dialogs/event-page.c	2001/12/05 15:36:06
@@ -51,6 +51,7 @@
 	GtkWidget *main;
 
 	GtkWidget *summary;
+	GtkWidget *location;
 
 	GtkWidget *start_time;
 	GtkWidget *end_time;
@@ -170,6 +171,7 @@
 
 	priv->main = NULL;
 	priv->summary = NULL;
+	priv->location = NULL;
 	priv->start_time = NULL;
 	priv->end_time = NULL;
 	priv->start_timezone = NULL;
@@ -403,6 +405,7 @@
 
 	/* Summary, description */
 	e_dialog_editable_set (priv->summary, NULL);
+	e_dialog_editable_set (priv->location, NULL);
 	e_dialog_editable_set (priv->description, NULL);
 
 	/* Start and end times */
@@ -465,6 +468,7 @@
 	CalComponentClassification cl;
 	CalComponentTransparency transparency;
 	CalComponentDateTime start_date, end_date;
+	const char *location;
 	const char *categories;
 	GSList *l;
 
@@ -479,11 +483,14 @@
 	/* Clean the page */
 	clear_widgets (epage);
 
-	/* Summary, description(s) */
+	/* Summary, location, description(s) */
 
 	cal_component_get_summary (comp, &text);
 	e_dialog_editable_set (priv->summary, text.value);
 
+	cal_component_get_location (comp, &location);
+	e_dialog_editable_set (priv->location, location);
+
 	cal_component_get_description_list (comp, &l);
 	if (l) {
 		text = *(CalComponentText *)l->data;
@@ -600,6 +607,17 @@
 	if (str)
 		g_free (str);
 
+	/* Location */
+
+	str = e_dialog_editable_get (priv->location);
+	if (!str || strlen (str) == 0)
+		cal_component_set_location (comp, NULL);
+	else
+		cal_component_set_location (comp, str);
+
+	if (str)
+		g_free (str);
+
 	/* Description */
 
 	str = e_dialog_editable_get (priv->description);
@@ -747,6 +765,7 @@
 	gtk_widget_unparent (priv->main);
 
 	priv->summary = GW ("general-summary");
+	priv->location = GW ("location");
 
 	priv->start_time = GW ("start-time");
 	priv->end_time = GW ("end-time");
@@ -772,6 +791,7 @@
 #undef GW
 
 	return (priv->summary
+		&& priv->location
 		&& priv->start_time
 		&& priv->end_time
 		&& priv->start_timezone
@@ -1283,6 +1303,8 @@
 	 */
 
 	gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
+			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
+	gtk_signal_connect (GTK_OBJECT (priv->location), "changed",
 			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
 	gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
 			    GTK_SIGNAL_FUNC (field_changed_cb), epage);
Index: gui/dialogs/event-page.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.glade,v
retrieving revision 1.7
diff -u -r1.7 event-page.glade
--- gui/dialogs/event-page.glade	2001/10/25 23:28:14	1.7
+++ gui/dialogs/event-page.glade	2001/12/05 15:36:07
@@ -37,7 +37,7 @@
     <widget>
       <class>GtkTable</class>
       <name>table11</name>
-      <rows>1</rows>
+      <rows>2</rows>
       <columns>2</columns>
       <homogeneous>False</homogeneous>
       <row_spacing>4</row_spacing>
@@ -88,6 +88,57 @@
 	  <right_attach>2</right_attach>
 	  <top_attach>0</top_attach>
 	  <bottom_attach>1</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>True</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>False</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label61</name>
+	<label>L_ocation:</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>7.45058e-09</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<default_focus_target>location</default_focus_target>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>1</top_attach>
+	  <bottom_attach>2</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>False</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkEntry</class>
+	<name>location</name>
+	<can_focus>True</can_focus>
+	<editable>True</editable>
+	<text_visible>True</text_visible>
+	<text_max_length>0</text_max_length>
+	<text></text>
+	<child>
+	  <left_attach>1</left_attach>
+	  <right_attach>2</right_attach>
+	  <top_attach>1</top_attach>
+	  <bottom_attach>2</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>True</xexpand>
