[evolution-patches] addressbook patch for #41232

[Anna Marie Dirks <anna ximian com>]

This patch is nigh identical to the previous one; it's for the *other*
Duplicate Contact Detected dialog (which appears when you change a
contact in such a way that it conflicts with an existing contact.) 

cheers,
Anna




-- 
Anna Marie Dirks <anna ximian com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1412
diff -u -u -w -r1.1412 ChangeLog
--- ChangeLog	16 May 2003 18:10:47 -0000	1.1412
+++ ChangeLog	16 May 2003 18:23:33 -0000
@@ -1,3 +1,14 @@
+2003-05-16  Anna Marie Dirks  <anna ximian com>
+
+	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade: 
+	Changed button order, and added HIG-appropriate spacing/padding. 
+	Fixes bug #41232.
+	
+	* gui/merging/e-card-duplicate-detected.glade: Changed button 
+	order, and added HIG-appropriate spacing/padding. Fixes bug
+	#41229 and #41231.
+
+
 2003-05-15  Chris Toshok  <toshok ximian com>
 
 	* gui/component/addressbook.c (book_open_cb): backing out a tiny
Index: gui/merging/e-card-merging-book-commit-duplicate-detected.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade,v
retrieving revision 1.4
diff -u -u -w -r1.4 e-card-merging-book-commit-duplicate-detected.glade
--- gui/merging/e-card-merging-book-commit-duplicate-detected.glade	12 Nov 2002 04:01:08 -0000	1.4
+++ gui/merging/e-card-merging-book-commit-duplicate-detected.glade	16 May 2003 18:23:33 -0000
@@ -4,6 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="dialog-duplicate-contact">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Duplicate Contact Detected</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -17,7 +18,7 @@
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -29,10 +30,10 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Change Anyway</property>
-	      <property name="use_underline">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">0</property>
+	      <property name="response_id">1</property>
 	    </widget>
 	  </child>
 
@@ -41,10 +42,10 @@
 	      <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="label">gtk-add</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
+	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -58,6 +59,7 @@
 
       <child>
 	<widget class="GtkTable" id="table1">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">5</property>
 	  <property name="n_columns">2</property>