aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/contact-editor/e-contact-editor.c5
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c5
3 files changed, 12 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 257aa98954..827cf384a0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-08 Christopher James Lahey <clahey@helixcode.com>
+
+ * contact-editor/e-contact-editor.c (full_name_clicked): Made it
+ so that the editor->name is set after the entry is changed. This
+ means that the reparse that the person chose is saved.
+
2000-12-07 Ettore Perazzoli <ettore@helixcode.com>
* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 9e1afacb7b..bb7387502e 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -506,8 +506,6 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor)
gtk_object_get(GTK_OBJECT(dialog),
"name", &name,
NULL);
- e_card_name_free(editor->name);
- editor->name = e_card_name_copy(name);
fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
@@ -515,6 +513,9 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor)
e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
g_free(full_name);
}
+
+ e_card_name_free(editor->name);
+ editor->name = e_card_name_copy(name);
}
gtk_object_unref(GTK_OBJECT(dialog));
}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 9e1afacb7b..bb7387502e 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -506,8 +506,6 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor)
gtk_object_get(GTK_OBJECT(dialog),
"name", &name,
NULL);
- e_card_name_free(editor->name);
- editor->name = e_card_name_copy(name);
fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
@@ -515,6 +513,9 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor)
e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
g_free(full_name);
}
+
+ e_card_name_free(editor->name);
+ editor->name = e_card_name_copy(name);
}
gtk_object_unref(GTK_OBJECT(dialog));
}