From 76ac9cf157d412722d7dd0c6be41876243865e5d Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Wed, 21 May 2003 17:03:20 +0000
Subject: [PATCH] Fixes #41234

2003-05-21  Rodrigo Moya <rodrigo@ximian.com>

	Fixes #41234

	* gui/dialogs/e-delegate-dialog.glade: changed button ordering.

svn path=/trunk/; revision=21307
---
 calendar/ChangeLog                           |  1 -
 calendar/gui/dialogs/e-delegate-dialog.glade | 25 ++++++++++----------
 2 files changed, 13 insertions(+), 13 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>
@@ -23,6 +24,18 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
+	  <child>
+	    <widget class="GtkButton" id="cancel-button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="ok-button">
 	      <property name="visible">True</property>
@@ -35,18 +48,6 @@
 	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel-button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>