aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/merging/e-card-duplicate-detected.glade18
2 files changed, 16 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bfd5f5b1f3..215d78c950 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-19 Anna Marie Dirks <anna@ximian.com>
+
+ * gui/merging/e-card-duplicate-detected.glade: Changed button
+ order, and added HIG-appropriate spacing/padding. Fixes bug
+ #41229 and #41231.
+
2003-05-19 Sean Gao <sean.gao@sun.com>
* gui/component/addressbook-component.c (xfer_folder): remove the
diff --git a/addressbook/gui/merging/e-card-duplicate-detected.glade b/addressbook/gui/merging/e-card-duplicate-detected.glade
index 67536bf7cf..5c287cd163 100644
--- a/addressbook/gui/merging/e-card-duplicate-detected.glade
+++ b/addressbook/gui/merging/e-card-duplicate-detected.glade
@@ -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">
@@ -25,26 +26,26 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button3">
+ <widget class="GtkButton" id="button4">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Add 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>
<child>
- <widget class="GtkButton" id="button4">
+ <widget class="GtkButton" id="button3">
<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>