New function. (general_summary_changed_cb): Sync the general summary to

2000-10-27  Federico Mena Quintero  <federico@helixcode.com>

	* gui/event-editor.c (sync_entries): New function.
	(general_summary_changed_cb): Sync the general summary to the
	recurrence summary widget.
	(recurrence_summary_changed_cb): Vice-versa.
	(init_widgets): Hook to the summaries.

	* event-editor-dialog.glade: Do not expand/fill the start and end
	date so that the "all day event" button is not pushed all the way
	to the right.
	Decrease the spacing between the recurrence sentence widgets.
	Remove a spurious empty label that was lurking around the
	recurrence widgets.
	Make the alarm widgets expand the right way.
	Delete old recurrence widgets.

svn path=/trunk/; revision=6246

4 files changed, 522 insertions, 1331 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ac32bf98fb..288e16435c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,22 @@
 2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
 
+	* gui/event-editor.c (sync_entries): New function.
+	(general_summary_changed_cb): Sync the general summary to the
+	recurrence summary widget.
+	(recurrence_summary_changed_cb): Vice-versa.
+	(init_widgets): Hook to the summaries.
+
+	* event-editor-dialog.glade: Do not expand/fill the start and end
+	date so that the "all day event" button is not pushed all the way
+	to the right.
+	Decrease the spacing between the recurrence sentence widgets.
+	Remove a spurious empty label that was lurking around the
+	recurrence widgets.
+	Make the alarm widgets expand the right way.
+	Delete old recurrence widgets.
+
+2000-10-27  Federico Mena Quintero  <federico@helixcode.com>
+
 	* gui/event-editor.c (init_widgets): Connect to the recurrence
 	ending menu.
 	(recur_ending_selection_done_cb): Implemented.
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
index 97a40666ee..fb30e23f14 100644
--- a/calendar/gui/event-editor-dialog.glade
+++ b/calendar/gui/event-editor-dialog.glade
@@ -151,31 +151,6 @@
 	    <column_spacing>4</column_spacing>
 
 	    <widget>
-	      <class>Custom</class>
-	      <name>start-time</name>
-	      <creation_function>make_date_edit_with_time</creation_function>
-	      <string1></string1>
-	      <string2></string2>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:05 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<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>label15</name>
 	      <label>_Start time:</label>
@@ -228,47 +203,72 @@
 	    </widget>
 
 	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>all-day-event</name>
+	      <can_focus>True</can_focus>
+	      <label>A_ll day event</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>2</left_attach>
+		<right_attach>3</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</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>Custom</class>
-	      <name>end-time</name>
+	      <name>start-time</name>
 	      <creation_function>make_date_edit_with_time</creation_function>
+	      <string1></string1>
+	      <string2></string2>
 	      <int1>0</int1>
 	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:10 GMT</last_modification_time>
+	      <last_modification_time>Tue, 16 May 2000 19:11:05 GMT</last_modification_time>
 	      <child>
 		<left_attach>1</left_attach>
 		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>True</xexpand>
+		<xexpand>False</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
-		<xfill>True</xfill>
+		<xfill>False</xfill>
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
 
 	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>all-day-event</name>
-	      <can_focus>True</can_focus>
-	      <label>A_ll day event</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
+	      <class>Custom</class>
+	      <name>end-time</name>
+	      <creation_function>make_date_edit_with_time</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Tue, 16 May 2000 19:11:10 GMT</last_modification_time>
 	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
+		<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>False</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
-		<xfill>True</xfill>
+		<xfill>False</xfill>
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
@@ -388,145 +388,115 @@
 	<column_spacing>4</column_spacing>
 
 	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-display-amount</name>
+	  <class>GtkOptionMenu</class>
+	  <name>alarm-display-unit</name>
 	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>True</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
+	  <items>Minutes
+Hours
+Days
+</items>
+	  <initial_choice>0</initial_choice>
 	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</right_attach>
 	    <top_attach>0</top_attach>
 	    <bottom_attach>1</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
+	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-audio-amount</name>
+	  <class>GtkOptionMenu</class>
+	  <name>alarm-audio-unit</name>
 	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
+	  <items>Minutes
+Hours
+Days
+</items>
+	  <initial_choice>0</initial_choice>
 	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</right_attach>
 	    <top_attach>1</top_attach>
 	    <bottom_attach>2</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
+	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-program-amount</name>
+	  <class>GtkOptionMenu</class>
+	  <name>alarm-program-unit</name>
 	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
+	  <items>Minutes
+Hours
+Days
+</items>
+	  <initial_choice>0</initial_choice>
 	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</right_attach>
 	    <top_attach>2</top_attach>
 	    <bottom_attach>3</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
+	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-mail-amount</name>
+	  <class>GtkOptionMenu</class>
+	  <name>alarm-mail-unit</name>
 	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
+	  <items>Minutes
+Hours
+Days
+</items>
+	  <initial_choice>0</initial_choice>
 	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</right_attach>
 	    <top_attach>3</top_attach>
 	    <bottom_attach>4</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
+	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-display-unit</name>
+	  <class>GtkCheckButton</class>
+	  <name>alarm-display</name>
 	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
+	  <label>_Display</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
 	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
 	    <top_attach>0</top_attach>
 	    <bottom_attach>1</bottom_attach>
 	    <xpad>0</xpad>
@@ -535,73 +505,71 @@ Days
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
+	    <xfill>True</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-audio-unit</name>
+	  <class>GtkCheckButton</class>
+	  <name>alarm-program</name>
 	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
+	  <label>_Program</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
 	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
+	    <xfill>True</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-program-unit</name>
+	  <class>GtkCheckButton</class>
+	  <name>alarm-mail</name>
 	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
+	  <label>_Mail</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
 	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
+	    <xfill>True</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-mail-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
+	  <class>GtkLabel</class>
+	  <name>label18</name>
+	  <label>Mail _to:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>7.45058e-09</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <focus_target>alarm-mail-mail-to</focus_target>
 	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
+	    <left_attach>3</left_attach>
+	    <right_attach>4</right_attach>
 	    <top_attach>3</top_attach>
 	    <bottom_attach>4</bottom_attach>
 	    <xpad>0</xpad>
@@ -610,7 +578,34 @@ Days
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label17</name>
+	  <label>_Run program:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <focus_target>alarm-program-run-program-entry</focus_target>
+	  <child>
+	    <left_attach>3</left_attach>
+	    <right_attach>4</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</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>
@@ -632,7 +627,7 @@ Days
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
+	    <xshrink>True</xshrink>
 	    <yshrink>False</yshrink>
 	    <xfill>True</xfill>
 	    <yfill>False</yfill>
@@ -654,7 +649,7 @@ Days
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
+	    <xshrink>True</xshrink>
 	    <yshrink>False</yshrink>
 	    <xfill>True</xfill>
 	    <yfill>False</yfill>
@@ -674,29 +669,6 @@ Days
 
 	<widget>
 	  <class>GtkCheckButton</class>
-	  <name>alarm-display</name>
-	  <can_focus>True</can_focus>
-	  <label>_Display</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</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>GtkCheckButton</class>
 	  <name>alarm-audio</name>
 	  <can_focus>True</can_focus>
 	  <label>_Audio</label>
@@ -719,101 +691,129 @@ Days
 	</widget>
 
 	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-program</name>
+	  <class>GtkSpinButton</class>
+	  <name>alarm-display-amount</name>
 	  <can_focus>True</can_focus>
-	  <label>_Program</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
+	  <climb_rate>1</climb_rate>
+	  <digits>0</digits>
+	  <numeric>True</numeric>
+	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	  <snap>False</snap>
+	  <wrap>False</wrap>
+	  <value>0</value>
+	  <lower>0</lower>
+	  <upper>100</upper>
+	  <step>1</step>
+	  <page>10</page>
+	  <page_size>10</page_size>
 	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-mail</name>
+	  <class>GtkSpinButton</class>
+	  <name>alarm-audio-amount</name>
 	  <can_focus>True</can_focus>
-	  <label>_Mail</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
+	  <climb_rate>1</climb_rate>
+	  <digits>0</digits>
+	  <numeric>False</numeric>
+	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	  <snap>False</snap>
+	  <wrap>False</wrap>
+	  <value>0</value>
+	  <lower>0</lower>
+	  <upper>100</upper>
+	  <step>1</step>
+	  <page>10</page>
+	  <page_size>10</page_size>
 	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
+	    <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>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label>Mail _to:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <class>GtkSpinButton</class>
+	  <name>alarm-program-amount</name>
+	  <can_focus>True</can_focus>
+	  <climb_rate>1</climb_rate>
+	  <digits>0</digits>
+	  <numeric>False</numeric>
+	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	  <snap>False</snap>
 	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-mail-mail-to</focus_target>
+	  <value>0</value>
+	  <lower>0</lower>
+	  <upper>100</upper>
+	  <step>1</step>
+	  <page>10</page>
+	  <page_size>10</page_size>
 	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkLabel</class>
-	  <name>label17</name>
-	  <label>_Run program:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <class>GtkSpinButton</class>
+	  <name>alarm-mail-amount</name>
+	  <can_focus>True</can_focus>
+	  <climb_rate>1</climb_rate>
+	  <digits>0</digits>
+	  <numeric>False</numeric>
+	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	  <snap>False</snap>
 	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-program-run-program-entry</focus_target>
+	  <value>0</value>
+	  <lower>0</lower>
+	  <upper>100</upper>
+	  <step>1</step>
+	  <page>10</page>
+	  <page_size>10</page_size>
 	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
+	    <xfill>False</xfill>
 	    <yfill>False</yfill>
 	  </child>
 	</widget>
@@ -833,581 +833,120 @@ Days
       </widget>
 
       <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>6</border_width>
+	<class>GtkTable</class>
+	<name>table8</name>
+	<rows>2</rows>
+	<columns>4</columns>
 	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
+	<row_spacing>2</row_spacing>
+	<column_spacing>2</column_spacing>
 
 	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame8</name>
-	  <label>Recurrence rule</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <class>GtkRadioButton</class>
+	  <name>recurrence-rule-monthly-on-day</name>
+	  <can_focus>True</can_focus>
+	  <label>Recur on the</label>
+	  <active>True</active>
+	  <draw_indicator>True</draw_indicator>
+	  <group>recurrence_rule_monthly_group</group>
 	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>False</xfill>
+	    <yfill>False</yfill>
 	  </child>
+	</widget>
 
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox4</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-none</name>
-		<can_focus>True</can_focus>
-		<label>None</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-daily</name>
-		<can_focus>True</can_focus>
-		<label>Daily</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-weekly</name>
-		<can_focus>True</can_focus>
-		<label>Weekly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-monthly</name>
-		<can_focus>True</can_focus>
-		<label>Monthly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-yearly</name>
-		<can_focus>True</can_focus>
-		<label>Yearly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVSeparator</class>
-	      <name>vseparator1</name>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkNotebook</class>
-	      <name>recurrence-rule-notebook</name>
-	      <show_tabs>False</show_tabs>
-	      <show_border>False</show_border>
-	      <tab_pos>GTK_POS_TOP</tab_pos>
-	      <scrollable>False</scrollable>
-	      <tab_hborder>2</tab_hborder>
-	      <tab_vborder>2</tab_vborder>
-	      <popup_enable>False</popup_enable>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table6</name>
-		<rows>3</rows>
-		<columns>3</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>0</row_spacing>
-		<column_spacing>0</column_spacing>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label23</name>
-		<label>label23</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-
-	      <widget>
-		<class>GtkAlignment</class>
-		<name>alignment1</name>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xscale>1</xscale>
-		<yscale>1</yscale>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox7</name>
-		  <border_width>4</border_width>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox13</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label31</name>
-		      <label>Every </label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>recurrence-rule-daily-days</name>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>1</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label32</name>
-		      <label>day(s)</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label24</name>
-		<label>label24</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox8</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>2</spacing>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox14</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label33</name>
-		    <label>Every </label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-weekly-weeks</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>0</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label34</name>
-		    <label>week(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox15</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-mon</name>
-		    <can_focus>True</can_focus>
-		    <label>Mon</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-tue</name>
-		    <can_focus>True</can_focus>
-		    <label>Tue</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-wed</name>
-		    <can_focus>True</can_focus>
-		    <label>Wed</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-thu</name>
-		    <can_focus>True</can_focus>
-		    <label>Thu</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-fri</name>
-		    <can_focus>True</can_focus>
-		    <label>Fri</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-sat</name>
-		    <can_focus>True</can_focus>
-		    <label>Sat</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-sun</name>
-		    <can_focus>True</can_focus>
-		    <label>Sun</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label25</name>
-		<label>label25</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table8</name>
-		<rows>2</rows>
-		<columns>4</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>2</row_spacing>
-		<column_spacing>2</column_spacing>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-rule-monthly-on-day</name>
-		  <can_focus>True</can_focus>
-		  <label>Recur on the</label>
-		  <active>True</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_rule_monthly_group</group>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-rule-monthly-weekday</name>
-		  <can_focus>True</can_focus>
-		  <label>Recur on the</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_rule_monthly_group</group>
-		  <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>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
+	<widget>
+	  <class>GtkRadioButton</class>
+	  <name>recurrence-rule-monthly-weekday</name>
+	  <can_focus>True</can_focus>
+	  <label>Recur on the</label>
+	  <active>False</active>
+	  <draw_indicator>True</draw_indicator>
+	  <group>recurrence_rule_monthly_group</group>
+	  <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>False</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label35</name>
-		  <label>th day of the month</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label35</name>
+	  <label>th day of the month</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0.5</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>False</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-rule-monthly-week</name>
-		  <can_focus>True</can_focus>
-		  <items>1st
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>recurrence-rule-monthly-week</name>
+	  <can_focus>True</can_focus>
+	  <items>1st
 2nd
 3rd
 4th
 5th
 </items>
-		  <initial_choice>0</initial_choice>
-		  <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>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
+	  <initial_choice>0</initial_choice>
+	  <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>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>False</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-rule-monthly-weekpos</name>
-		  <can_focus>True</can_focus>
-		  <items>Monday
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>recurrence-rule-monthly-weekpos</name>
+	  <can_focus>True</can_focus>
+	  <items>Monday
 Tuesday
 Wednesday
 Thursday
@@ -1415,505 +954,133 @@ Friday
 Saturday
 Sunday
 </items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</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>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox19</name>
-		  <border_width>3</border_width>
-		  <homogeneous>False</homogeneous>
-		  <spacing>3</spacing>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label36</name>
-		    <label>Every</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-monthly-every-n-months</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>1</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label37</name>
-		    <label>month(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-rule-monthly-day-nth</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>False</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>1</value>
-		  <lower>0</lower>
-		  <upper>100</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</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>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label26</name>
-		<label>label26</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox11</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox20</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label38</name>
-		    <label>Every </label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-yearly-every-n-years</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>0</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label39</name>
-		    <label>year(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label27</name>
-		<label>label27</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-	  </widget>
+	  <initial_choice>0</initial_choice>
+	  <child>
+	    <left_attach>2</left_attach>
+	    <right_attach>3</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>False</xfill>
+	    <yfill>False</yfill>
+	  </child>
 	</widget>
 
 	<widget>
 	  <class>GtkHBox</class>
-	  <name>hbox8</name>
+	  <name>hbox19</name>
+	  <border_width>3</border_width>
 	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
+	  <spacing>3</spacing>
 	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
+	    <left_attach>3</left_attach>
+	    <right_attach>4</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
 	  </child>
 
 	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame9</name>
-	    <label>Ending date</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	    <class>GtkLabel</class>
+	    <name>label36</name>
+	    <label>Every</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
-	      <fill>True</fill>
+	      <fill>False</fill>
 	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox5</name>
-	      <border_width>4</border_width>
-	      <homogeneous>True</homogeneous>
-	      <spacing>2</spacing>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-ending-date-repeat-forever</name>
-		<can_focus>True</can_focus>
-		<label>Repeat forever</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_ending_date</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox12</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-ending-date-end-on</name>
-		  <can_focus>True</can_focus>
-		  <label>End on </label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_ending_date</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>Custom</class>
-		  <name>recurrence-ending-date-end-on-date</name>
-		  <width>100</width>
-		  <creation_function>make_date_edit</creation_function>
-		  <int1>0</int1>
-		  <int2>0</int2>
-		  <last_modification_time>Sat, 13 May 2000 18:02:55 GMT</last_modification_time>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox10</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-ending-date-end-after</name>
-		  <can_focus>True</can_focus>
-		  <label>End after</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_ending_date</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-ending-date-end-after-count</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>False</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>2</value>
-		  <lower>0</lower>
-		  <upper>100</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label28</name>
-		  <label>occurrence(s)</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
 	  </widget>
 
 	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame10</name>
-	    <label>Exceptions</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	    <class>GtkSpinButton</class>
+	    <name>recurrence-rule-monthly-every-n-months</name>
+	    <can_focus>True</can_focus>
+	    <climb_rate>1</climb_rate>
+	    <digits>0</digits>
+	    <numeric>False</numeric>
+	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	    <snap>False</snap>
+	    <wrap>False</wrap>
+	    <value>1</value>
+	    <lower>1</lower>
+	    <upper>100</upper>
+	    <step>1</step>
+	    <page>10</page>
+	    <page_size>10</page_size>
 	    <child>
 	      <padding>0</padding>
-	      <expand>True</expand>
+	      <expand>False</expand>
 	      <fill>True</fill>
 	    </child>
+	  </widget>
 
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox12</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox21</name>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox13</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>2</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exceptions-change</name>
-		    <can_focus>True</can_focus>
-		    <label></label>
-		    <relief>GTK_RELIEF_NORMAL</relief>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>Placeholder</class>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkScrolledWindow</class>
-		  <name>scrolledwindow2</name>
-		  <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		  <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkCList</class>
-		    <name>recurrence-exceptions-list</name>
-		    <can_focus>True</can_focus>
-		    <columns>1</columns>
-		    <column_widths>80</column_widths>
-		    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		    <show_titles>False</show_titles>
-		    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <child_name>CList:title</child_name>
-		      <name>label40</name>
-		      <label></label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label37</name>
+	    <label>month(s)</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 	  </widget>
 	</widget>
+
+	<widget>
+	  <class>GtkSpinButton</class>
+	  <name>recurrence-rule-monthly-day-nth</name>
+	  <can_focus>True</can_focus>
+	  <climb_rate>1</climb_rate>
+	  <digits>0</digits>
+	  <numeric>False</numeric>
+	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	  <snap>False</snap>
+	  <wrap>False</wrap>
+	  <value>1</value>
+	  <lower>0</lower>
+	  <upper>100</upper>
+	  <step>1</step>
+	  <page>10</page>
+	  <page_size>10</page_size>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</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>
 
       <widget>
@@ -2038,10 +1205,10 @@ Sunday
 	    <widget>
 	      <class>GtkAlignment</class>
 	      <name>alignment37</name>
-	      <xalign>7.45058e-09</xalign>
+	      <xalign>0</xalign>
 	      <yalign>0.5</yalign>
 	      <xscale>0</xscale>
-	      <yscale>1</yscale>
+	      <yscale>0</yscale>
 	      <child>
 		<left_attach>1</left_attach>
 		<right_attach>2</right_attach>
@@ -2049,12 +1216,12 @@ Sunday
 		<bottom_attach>2</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>True</xexpand>
+		<xexpand>False</xexpand>
 		<yexpand>False</yexpand>
-		<xshrink>True</xshrink>
+		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
 		<xfill>True</xfill>
-		<yfill>False</yfill>
+		<yfill>True</yfill>
 	      </child>
 
 	      <widget>
@@ -2160,7 +1327,7 @@ Sunday
 		<class>GtkHBox</class>
 		<name>recurrence-params</name>
 		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
+		<spacing>2</spacing>
 		<child>
 		  <padding>0</padding>
 		  <expand>False</expand>
@@ -2243,23 +1410,6 @@ year(s)
 		</widget>
 
 		<widget>
-		  <class>GtkLabel</class>
-		  <name>label47</name>
-		  <label></label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>2</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
 		  <class>GtkOptionMenu</class>
 		  <name>recurrence-ending-menu</name>
 		  <can_focus>True</can_focus>
@@ -2315,8 +1465,8 @@ forever
 	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	      <child>
 		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
+		<expand>False</expand>
+		<fill>False</fill>
 	      </child>
 
 	      <widget>
@@ -2457,8 +1607,8 @@ However, the appointment will recur at the appropriate time and will be displaye
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
+		<expand>True</expand>
+		<fill>True</fill>
 	      </child>
 	    </widget>
 	  </widget>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
index 8266d8dcdd..19a5d88931 100644
--- a/calendar/gui/event-editor-dialog.glade.h
+++ b/calendar/gui/event-editor-dialog.glade.h
@@ -28,32 +28,12 @@ gchar *s = N_("Minutes");
 gchar *s = N_("Hours");
 gchar *s = N_("Days");
 gchar *s = N_("_Display");
-gchar *s = N_("_Audio");
 gchar *s = N_("_Program");
 gchar *s = N_("_Mail");
 gchar *s = N_("Mail _to:");
 gchar *s = N_("_Run program:");
+gchar *s = N_("_Audio");
 gchar *s = N_("Reminder");
-gchar *s = N_("Recurrence rule");
-gchar *s = N_("None");
-gchar *s = N_("Daily");
-gchar *s = N_("Weekly");
-gchar *s = N_("Monthly");
-gchar *s = N_("Yearly");
-gchar *s = N_("label23");
-gchar *s = N_("Every ");
-gchar *s = N_("day(s)");
-gchar *s = N_("label24");
-gchar *s = N_("Every ");
-gchar *s = N_("week(s)");
-gchar *s = N_("Mon");
-gchar *s = N_("Tue");
-gchar *s = N_("Wed");
-gchar *s = N_("Thu");
-gchar *s = N_("Fri");
-gchar *s = N_("Sat");
-gchar *s = N_("Sun");
-gchar *s = N_("label25");
 gchar *s = N_("Recur on the");
 gchar *s = N_("Recur on the");
 gchar *s = N_("th day of the month");
@@ -71,16 +51,6 @@ gchar *s = N_("Saturday");
 gchar *s = N_("Sunday");
 gchar *s = N_("Every");
 gchar *s = N_("month(s)");
-gchar *s = N_("label26");
-gchar *s = N_("Every ");
-gchar *s = N_("year(s)");
-gchar *s = N_("label27");
-gchar *s = N_("Ending date");
-gchar *s = N_("Repeat forever");
-gchar *s = N_("End on ");
-gchar *s = N_("End after");
-gchar *s = N_("occurrence(s)");
-gchar *s = N_("Exceptions");
 gchar *s = N_("Recurrence");
 gchar *s = N_("Appointment Basics");
 gchar *s = N_("Su_mmary:");
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index 92eb6816e1..df6e978c08 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -336,7 +336,7 @@ make_recur_weekly_special (EventEditor *ee)
 
 	/* Create the widgets */
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_hbox_new (FALSE, 2);
 	gtk_container_add (GTK_CONTAINER (priv->recurrence_special), hbox);
 
 	label = gtk_label_new (_("on"));
@@ -460,7 +460,7 @@ make_recur_ending_count_special (EventEditor *ee)
 
 	/* Create the widgets */
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_hbox_new (FALSE, 2);
 	gtk_container_add (GTK_CONTAINER (priv->recurrence_ending_special), hbox);
 
 	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
@@ -726,6 +726,53 @@ get_widgets (EventEditor *ee)
 		&& priv->recurrence_exception_delete);
 }
 
+/* Syncs the contents of two entry widgets, while blocking signals on the
+ * specified data.
+ */
+static void
+sync_entries (GtkWidget *source, GtkWidget *dest, gpointer data)
+{
+	char *str;
+
+	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), data);
+
+	str = gtk_editable_get_chars (GTK_EDITABLE (source), 0, -1);
+	gtk_entry_set_text (GTK_ENTRY (dest), str);
+	g_free (str);
+
+	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), data);
+}
+
+/* Callback used when the general summary changes; we sync the recurrence
+ * summary to it.
+ */
+static void
+general_summary_changed_cb (GtkEditable *editable, gpointer data)
+{
+	EventEditor *ee;
+	EventEditorPrivate *priv;
+
+	ee = EVENT_EDITOR (data);
+	priv = ee->priv;
+
+	sync_entries (priv->general_summary, priv->recurrence_summary, ee);
+}
+
+/* Callback used when the recurrence summary changes; we sync the general
+ * summary to it.
+ */
+static void
+recurrence_summary_changed_cb (GtkEditable *editable, gpointer data)
+{
+	EventEditor *ee;
+	EventEditorPrivate *priv;
+
+	ee = EVENT_EDITOR (data);
+	priv = ee->priv;
+
+	sync_entries (priv->recurrence_summary, priv->general_summary, ee);
+}
+
 /* Hooks the widget signals */
 static void
 init_widgets (EventEditor *ee)
@@ -735,6 +782,13 @@ init_widgets (EventEditor *ee)
 
 	priv = ee->priv;
 
+	/* Summary in the main and recurrence pages */
+
+	gtk_signal_connect (GTK_OBJECT (priv->general_summary), "changed",
+			    GTK_SIGNAL_FUNC (general_summary_changed_cb), ee);
+	gtk_signal_connect (GTK_OBJECT (priv->recurrence_summary), "changed",
+			    GTK_SIGNAL_FUNC (recurrence_summary_changed_cb), ee);
+
 	/* Start and end times */
 
 	gtk_signal_connect (GTK_OBJECT (priv->start_time), "date_changed",
@@ -840,7 +894,7 @@ clear_widgets (EventEditor *ee)
 
 	/* Summary, description */
 
-	e_dialog_editable_set (priv->general_summary, NULL);
+	e_dialog_editable_set (priv->general_summary, NULL); /* will also change recur summary */
 	e_dialog_editable_set (priv->description, NULL);
 
 	/* Start and end times */
@@ -1161,7 +1215,7 @@ fill_widgets (EventEditor *ee)
 	/* Summary, description(s) */
 
 	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->general_summary, text.value);
+	e_dialog_editable_set (priv->general_summary, text.value); /* will also set recur summary */
 
 	cal_component_get_description_list (priv->comp, &l);
 	if (l) {