aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog1
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.glade15
2 files changed, 8 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 18565b59a4..f35440a010 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -81,7 +81,6 @@
* gui/e-day-view.c (e_day_view_finish_resize): hide canvas items and
update internal fields before updating the object.
->>>>>>> 1.1774
2003-05-15 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor.c (comp_editor_finalize): unref the
diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade
index f7f958007d..f08c03ad1d 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.glade
+++ b/calendar/gui/dialogs/e-delegate-dialog.glade
@@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
+<requires lib="gnome"/>
<widget class="GtkDialog" id="delegate-dialog">
<property name="title" translatable="yes">Enter Delegate</property>
@@ -24,27 +25,27 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="ok-button">
+ <widget class="GtkButton" id="cancel-button">
<property name="visible">True</property>
<property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-5</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="cancel-button">
+ <widget class="GtkButton" id="ok-button">
<property name="visible">True</property>
<property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-6</property>
+ <property name="response_id">-5</property>
</widget>
</child>
</widget>