diff options
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c8998e2006..9e1df5ca82 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,10 @@ 2000-06-02 Christopher James Lahey <clahey@helixcode.com> + * contact-editor/e-contact-editor.c: Made phone/email/address + labels change correctly again. + +2000-06-02 Christopher James Lahey <clahey@helixcode.com> + * gui/component/addressbook-component.c: Made evolution-addressbook shut down when the shell is done with it. diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index 5d7485561c..5ca3fd753e 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -661,9 +661,9 @@ _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *edito e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info); } else { #endif - GtkWidget *entry_widget = glade_xml_get_widget(editor->gui, label); - if (entry_widget && GTK_IS_ENTRY(entry_widget)) { - gtk_object_set(GTK_OBJECT(entry_widget), + GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label); + if (label_widget && GTK_IS_LABEL(label_widget)) { + gtk_object_set(GTK_OBJECT(label_widget), "label", g_list_nth_data(*list, menu_item), NULL); } diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 5d7485561c..5ca3fd753e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -661,9 +661,9 @@ _arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *edito e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info); } else { #endif - GtkWidget *entry_widget = glade_xml_get_widget(editor->gui, label); - if (entry_widget && GTK_IS_ENTRY(entry_widget)) { - gtk_object_set(GTK_OBJECT(entry_widget), + GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label); + if (label_widget && GTK_IS_LABEL(label_widget)) { + gtk_object_set(GTK_OBJECT(label_widget), "label", g_list_nth_data(*list, menu_item), NULL); } |