From 72fcf71252f237bdf780df0c08b51f557876b92d Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@ximian.com>
Date: Mon, 3 May 2004 18:43:59 +0000
Subject: rename the cancel button.

2004-05-03  Larry Ewing  <lewing@ximian.com>

       * gui/dialogs/calendar-setup.glade: rename the cancel button.

svn path=/trunk/; revision=25765
---
 calendar/ChangeLog                        | 12 ++++++++++++
 calendar/gui/dialogs/calendar-setup.glade |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b702981ede..1a59645e67 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2004-05-03  Larry Ewing  <lewing@ximian.com>
+
+	* gui/dialogs/calendar-setup.glade: rename the cancel button.
+
+2004-04-29  Larry Ewing  <lewing@ximian.com>
+
+	* gui/e-cal-model.c (ecm_get_color_for_component): use the source
+	color if it is set.  Yay for ugly colors.
+
+	* gui/e-cal-model.h: add a color holder to the ECalModelComponent
+	since the return value of the color stuff is const.
+
 2004-05-03  JP Rosevear  <jpr@ximian.com>
 
 	Fixes #51714
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
index 9f916d237f..758759b8e4 100644
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ b/calendar/gui/dialogs/calendar-setup.glade
@@ -1291,6 +1291,7 @@
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">source-color</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -1563,7 +1564,7 @@
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button18">
+	    <widget class="GtkButton" id="cancel-button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-- 
cgit