aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c9
2 files changed, 12 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7df8205330..9f15099090 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-16 Devashish Sharma <sdevashish@novell.com>
+
+ * gui/contact-list-editor/e-contact-list-editor.c :
+ Fix for Bug #317511
+
2006-06-15 Devashish Sharma <sdevashish@novell.com>
* gui/component/addressbook-view.c : Drag-n-drop contacts now
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 21dd8da9e7..5674ffb7db 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -484,7 +484,11 @@ close_cb (GtkWidget *widget, EContactListEditor *cle)
static void
save_and_close_cb (GtkWidget *widget, EContactListEditor *cle)
{
- save_contact (cle, TRUE);
+ EABEditor *editor = EAB_EDITOR (cle);
+ if (! (cle->editable && cle->allows_contact_lists))
+ eab_editor_close(editor);
+ else
+ save_contact (cle, TRUE);
}
static void
@@ -903,7 +907,8 @@ set_editable (EContactListEditor *editor)
gtk_widget_set_sensitive (editor->add_button, editor->editable && editor->allows_contact_lists);
gtk_widget_set_sensitive (editor->remove_button, editor->editable && editor->allows_contact_lists);
gtk_widget_set_sensitive (editor->select_button, editor->editable && editor->allows_contact_lists);
- gtk_widget_set_sensitive (editor->table, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->cancel_button, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->visible_addrs_checkbutton, editor->editable && editor->allows_contact_lists);
}
/* Callback used when the editor is destroyed */