aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 11439aaf87..2185e12d93 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2004-05-03 Hans Petter Jansson <hpj@ximian.com>
+ * gui/contact-editor/e-contact-editor.c (phones_default): Establish
+ defaults for the phone number option menus.
+ (fill_in_phone_record): Fall back to defaults.
+
+2004-05-03 Hans Petter Jansson <hpj@ximian.com>
+
* gui/contact-editor/e-contact-editor.c (show_help_cb): Implement.
(e_contact_editor_init): Hook up the help button.
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 0b9868b38c..22e39c36cd 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -159,6 +159,9 @@ phones [] = {
{ E_CONTACT_PHONE_TTYTDD, EVC_X_TTYTDD, NULL }
};
+/* Defaults from the table above */
+gint phones_default [] = { 1, 6, 2, 9 };
+
static EContactField addresses[] = {
E_CONTACT_ADDRESS_WORK,
E_CONTACT_ADDRESS_HOME,
@@ -681,7 +684,8 @@ fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, g
g_free (widget_name);
gtk_option_menu_set_history (GTK_OPTION_MENU (phone_type_option_menu),
- phone_type >= 0 ? phone_type : 0);
+ phone_type >= 0 ? phone_type :
+ phones_default [record - 1]);
set_entry_text (editor, GTK_ENTRY (phone_entry), phone ? phone : "");
}