2007-07-10 [colin] 2.10.0cvs13
[claws.git] / src / editaddress.c
index 10e1be6479a1e1aa0cdd763a76e0c48110950050..a7015237b8d7786bd3d0126c14669082bcf90cfd 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -32,7 +33,6 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtktable.h>
 
-#include "intl.h"
 #include "mgutils.h"
 #include "addressbook.h"
 #include "addressitem.h"
 #include "manage_window.h"
 #include "gtkutils.h"
 #include "codeconv.h"
-
+#include "editaddress.h"
+#include "editaddress_other_attributes_ldap.h"
 #include "prefs_common.h"
 
-static struct _PersonEdit_dlg {
-       GtkWidget *window;
-       GtkWidget *notebook;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-       GtkWidget *statusbar;
-       gint status_cid;
-
-       /* Basic data tab */
-       GtkWidget *entry_name;
-       GtkWidget *entry_first;
-       GtkWidget *entry_last;
-       GtkWidget *entry_nick;
-
-       /* EMail data tab */
-       GtkWidget *entry_email;
-       GtkWidget *entry_alias;
-       GtkWidget *entry_remarks;
-       GtkWidget *clist_email;
-
-       /* Attribute data tab */
-       GtkWidget *entry_atname;
-       GtkWidget *entry_atvalue;
-       GtkWidget *clist_attrib;
-
-       gint rowIndEMail;
-       gint rowIndAttrib;
-       gboolean editNew;
-
-} personeditdlg;
+/* transient data */
+static struct _PersonEdit_dlg personeditdlg;
+static AddressBookFile *current_abf = NULL;
+static ItemPerson *current_person = NULL;
+static ItemFolder *current_parent_folder = NULL;
+static EditAddressPostUpdateCallback edit_person_close_post_update_cb = NULL;
 
 typedef enum {
        EMAIL_COL_EMAIL   = 0,
@@ -87,7 +64,7 @@ typedef enum {
 } PersonEditAttribColumnPos;
 
 #define EDITPERSON_WIDTH      520
-#define EDITPERSON_HEIGHT     340
+#define EDITPERSON_HEIGHT     320
 
 #define EMAIL_N_COLS          3
 #define EMAIL_COL_WIDTH_EMAIL 180
@@ -101,6 +78,8 @@ typedef enum {
 #define PAGE_EMAIL             1
 #define PAGE_ATTRIBUTES        2
 
+static gboolean addressbook_edit_person_close( gboolean cancelled );
+
 static void edit_person_status_show( gchar *msg ) {
        if( personeditdlg.statusbar != NULL ) {
                gtk_statusbar_pop( GTK_STATUSBAR(personeditdlg.statusbar), personeditdlg.status_cid );
@@ -112,30 +91,54 @@ static void edit_person_status_show( gchar *msg ) {
 
 static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
        *cancelled = FALSE;
-       gtk_main_quit();
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               gtk_main_quit();
+       else
+               addressbook_edit_person_close( *cancelled );
 }
 
 static void edit_person_cancel(GtkWidget *widget, gboolean *cancelled) {
        *cancelled = TRUE;
-       gtk_main_quit();
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               gtk_main_quit();
+       else
+               addressbook_edit_person_close( *cancelled );
 }
 
 static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboolean *cancelled) {
        *cancelled = TRUE;
-       gtk_main_quit();
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               gtk_main_quit();
+       else
+               addressbook_edit_person_close( *cancelled );
        return TRUE;
 }
 
-static void edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+       if (prefs_common.addressbook_use_editaddress_dialog) {
        if (event && event->keyval == GDK_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
+       }
+       return FALSE;
 }
 
 static gchar *_title_new_ = NULL;
 static gchar *_title_edit_ = NULL;
 
+static void edit_person_set_widgets_title( gchar *text )
+{
+       gchar *label = NULL;
+
+       g_return_if_fail( text != NULL );
+
+       gtk_label_set_text(GTK_LABEL(personeditdlg.title), "");
+       label = g_markup_printf_escaped("<b>%s</b>", text);
+       gtk_label_set_markup(GTK_LABEL(personeditdlg.title), label);
+       g_free(label);
+}
+
 static void edit_person_set_window_title( gint pageNum ) {
        gchar *sTitle;
 
@@ -146,10 +149,16 @@ static void edit_person_set_window_title( gint pageNum ) {
 
        if( pageNum == PAGE_BASIC ) {
                if( personeditdlg.editNew ) {
-                       gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_new_ );
+                       if (prefs_common.addressbook_use_editaddress_dialog)
+                               gtk_window_set_title( GTK_WINDOW(personeditdlg.container), _title_new_ );
+                       else
+                               edit_person_set_widgets_title( _title_new_ );
                }
                else {
-                       gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_edit_ );
+                       if (prefs_common.addressbook_use_editaddress_dialog)
+                               gtk_window_set_title( GTK_WINDOW(personeditdlg.container), _title_edit_ );
+                       else
+                               edit_person_set_widgets_title( _title_edit_ );
                }
        }
        else {
@@ -162,7 +171,10 @@ static void edit_person_set_window_title( gint pageNum ) {
                        sTitle = g_strdup_printf( "%s - %s", _title_edit_, name );
                        g_free( name );
                }
-               gtk_window_set_title( GTK_WINDOW(personeditdlg.window), sTitle );
+               if (prefs_common.addressbook_use_editaddress_dialog)
+                       gtk_window_set_title( GTK_WINDOW(personeditdlg.container), sTitle );
+               else
+                       edit_person_set_widgets_title( sTitle );
                g_free( sTitle );
        }
 }
@@ -174,8 +186,10 @@ static void edit_person_email_clear( gpointer data ) {
 }
 
 static void edit_person_attrib_clear( gpointer data ) {
-       gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), "" );
-       gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), "" );
+       if (!personeditdlg.ldap) {
+               gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), "" );
+               gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), "" );
+       }
 }
 
 static void edit_person_switch_page( GtkNotebook *notebook, GtkNotebookPage *page,
@@ -215,6 +229,15 @@ static void edit_person_email_list_selected( GtkCList *clist, gint row, gint col
                        gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_alias), ADDRITEM_NAME(email) );
                if( email->remarks )
                        gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_remarks), email->remarks );
+               if (!personeditdlg.read_only) {
+                       gtk_widget_set_sensitive(personeditdlg.email_del, TRUE);
+                       gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
+                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+               }
+       } else {
+               gtk_widget_set_sensitive(personeditdlg.email_del, FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_up, FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_down, FALSE);
        }
        personeditdlg.rowIndEMail = row;
        edit_person_status_show( NULL );
@@ -227,6 +250,13 @@ static void edit_person_email_move( gint dir ) {
        if( email ) {
                gtk_clist_row_move( clist, personeditdlg.rowIndEMail, row );
                personeditdlg.rowIndEMail = row;
+               if (!personeditdlg.read_only) {
+                       gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
+                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+               }
+       } else {
+               gtk_widget_set_sensitive(personeditdlg.email_up, FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_down, FALSE);
        }
        edit_person_email_clear( NULL );
        edit_person_status_show( NULL );
@@ -257,6 +287,11 @@ static void edit_person_email_delete( gpointer data ) {
        if( ! email ) {
                personeditdlg.rowIndEMail = -1 + row;
        }
+       if (!personeditdlg.read_only) {
+               gtk_widget_set_sensitive(personeditdlg.email_del, gtk_clist_get_row_data(clist, 0) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.email_up, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail + 1) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail - 1) != NULL);
+       }
        edit_person_status_show( NULL );
 }
 
@@ -282,7 +317,7 @@ static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
                *error = FALSE;
        }
        else {
-               edit_person_status_show( _( "An E-Mail address must be supplied." ) );
+               edit_person_status_show( _( "An Email address must be supplied." ) );
        }
 
        g_free( sEmail );
@@ -344,7 +379,37 @@ static gint edit_person_attrib_compare_func(
        if( cell2 ) name2 = cell2->u.text;
        if( ! name1 ) return ( name2 != NULL );
        if( ! name2 ) return -1;
-       return strcasecmp( name1, name2 );
+       return g_utf8_collate( name1, name2 );
+}
+
+static gboolean list_find_attribute(const gchar *attr)
+{
+       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       UserAttribute *attrib;
+       gint row = 0;
+       while( (attrib = gtk_clist_get_row_data( clist, row )) ) {
+               if (!g_ascii_strcasecmp(attrib->name, attr)) {
+                       gtk_clist_select_row(clist, row, 0);
+                       return TRUE;
+               }
+               row++;
+       }
+       return FALSE;
+}
+
+static gboolean list_find_email(const gchar *addr)
+{
+       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       ItemEMail *email;
+       gint row = 0;
+       while( (email = gtk_clist_get_row_data( clist, row )) ) {
+               if (!g_ascii_strcasecmp(email->address, addr)) {
+                       gtk_clist_select_row(clist, row, 0);
+                       return TRUE;
+               }
+               row++;
+       }
+       return FALSE;
 }
 
 /*
@@ -369,9 +434,12 @@ static void edit_person_load_attrib( ItemPerson *person ) {
 
 static void edit_person_attrib_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
        UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
-       if( attrib ) {
+       if( attrib && !personeditdlg.read_only && !personeditdlg.ldap ) {
                gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), attrib->name );
                gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), attrib->value );
+               gtk_widget_set_sensitive(personeditdlg.attrib_del, TRUE);
+       } else {
+               gtk_widget_set_sensitive(personeditdlg.attrib_del, FALSE);
        }
        personeditdlg.rowIndAttrib = row;
        edit_person_status_show( NULL );
@@ -393,7 +461,11 @@ static void edit_person_attrib_delete( gpointer data ) {
        attrib = gtk_clist_get_row_data( clist, row );
        if( ! attrib ) {
                personeditdlg.rowIndAttrib = -1 + row;
-       }
+       } 
+       
+       if (!personeditdlg.read_only && !personeditdlg.ldap)
+               gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
+       
        edit_person_status_show( NULL );
 }
 
@@ -463,34 +535,32 @@ static void edit_person_attrib_add( gpointer data ) {
        }
 }
 
-static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
-       GtkWidget *window;
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void edit_person_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.addressbookeditpersonwin_width = allocation->width;
+       prefs_common.addressbookeditpersonwin_height = allocation->height;
+}
+
+/* build edit person widgets, return a pointer to the main container of the widgetset (a vbox) */
+static GtkWidget* addressbook_edit_person_widgets_create( GtkWidget* container, gboolean *cancelled )
+{
        GtkWidget *vbox;
        GtkWidget *vnbox;
        GtkWidget *notebook;
        GtkWidget *hbbox;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
-       GtkWidget *hsbox;
-       GtkWidget *statusbar;
-
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
-       gtk_widget_set_usize(window, EDITPERSON_WIDTH, EDITPERSON_HEIGHT );
-       /* gtk_container_set_border_width(GTK_CONTAINER(window), 0); */
-       gtk_window_set_title(GTK_WINDOW(window), _("Edit Person Data"));
-       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(edit_person_delete_event),
-                          cancelled);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(edit_person_key_pressed),
-                          cancelled);
 
        vbox = gtk_vbox_new(FALSE, 4);
        /* gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH); */
        gtk_widget_show(vbox);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
+       gtk_container_add(GTK_CONTAINER(container), vbox);
 
        vnbox = gtk_vbox_new(FALSE, 4);
        gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
@@ -503,36 +573,113 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(vnbox), notebook, TRUE, TRUE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
 
-       /* Status line */
-       hsbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
-       statusbar = gtk_statusbar_new();
-       gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
-
        /* Button panel */
-       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
+       if (prefs_common.addressbook_use_editaddress_dialog)
+       gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
+                                     NULL, NULL);
+       else
+               gtkut_stock_with_text_button_set_create(&hbbox,
+                                         &cancel_btn, GTK_STOCK_CANCEL, _("Discard"),
+                                     &ok_btn, GTK_STOCK_OK, _("Apply"),
+                                     NULL, NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
 
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(edit_person_ok), cancelled);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(edit_person_cancel), cancelled);
-       gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
-                          GTK_SIGNAL_FUNC(edit_person_switch_page), NULL );
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(edit_person_ok), cancelled);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(edit_person_cancel), cancelled);
+       g_signal_connect(G_OBJECT(notebook), "switch_page",
+                        G_CALLBACK(edit_person_switch_page), NULL );
 
        gtk_widget_show_all(vbox);
 
-       personeditdlg.window     = window;
        personeditdlg.notebook   = notebook;
        personeditdlg.ok_btn     = ok_btn;
        personeditdlg.cancel_btn = cancel_btn;
+
+       return vbox;
+}
+
+static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
+       GtkWidget *window;
+       GtkWidget *hsbox;
+       GtkWidget *vbox;
+       GtkWidget *statusbar;
+       static GdkGeometry geometry;
+
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "editaddress");
+       /* gtk_container_set_border_width(GTK_CONTAINER(window), 0); */
+       gtk_window_set_title(GTK_WINDOW(window), _("Edit Person Data"));
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(edit_person_delete_event),
+                        cancelled);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(edit_person_size_allocate_cb),
+                       cancelled);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(edit_person_key_pressed),
+                        cancelled);
+
+       vbox = addressbook_edit_person_widgets_create(window, cancelled);
+
+       /* Status line */
+       hsbox = gtk_hbox_new(FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
+       statusbar = gtk_statusbar_new();
+       gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
+
+       if (!geometry.min_height) {
+               geometry.min_width = EDITPERSON_WIDTH;
+               geometry.min_height = EDITPERSON_HEIGHT;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.addressbookeditpersonwin_width,
+                                   prefs_common.addressbookeditpersonwin_height);
+
+       personeditdlg.container  = window;
        personeditdlg.statusbar  = statusbar;
        personeditdlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Person Dialog" );
 
 }
 
+/* parent must be a box */
+static void addressbook_edit_person_widgetset_create( GtkWidget *parent, gboolean *cancelled )
+{
+       GtkWidget *vbox;
+       GtkWidget *label;
+
+       if ( parent == NULL )
+               g_warning("addressbook_edit_person_widgetset_create: parent is NULL");
+
+       vbox = gtk_vbox_new(FALSE, 0);
+       gtk_box_pack_end(GTK_BOX(parent), vbox, TRUE, TRUE, 0);
+
+       label = gtk_label_new(_("Edit Person Data"));
+       gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+       addressbook_edit_person_widgets_create(vbox, cancelled);
+
+       gtk_widget_set_size_request(vbox, EDITPERSON_WIDTH, EDITPERSON_HEIGHT);
+
+       personeditdlg.container = vbox;
+       personeditdlg.title = label;
+       personeditdlg.statusbar  = NULL;
+       personeditdlg.status_cid = 0;
+}
+
+void addressbook_edit_person_widgetset_hide( void )
+{
+       if ( personeditdlg.container )
+               gtk_widget_hide( personeditdlg.container );
+}
+
 static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        GtkWidget *vbox;
        GtkWidget *table;
@@ -549,7 +696,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -577,9 +724,9 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        ATTACH_ROW(_("Display Name"), entry_name);
        locale = conv_get_current_locale();
        if (locale &&
-           (!g_strncasecmp(locale, "ja", 2) ||
-            !g_strncasecmp(locale, "ko", 2) ||
-            !g_strncasecmp(locale, "zh", 2))) {
+           (!g_ascii_strncasecmp(locale, "ja", 2) ||
+            !g_ascii_strncasecmp(locale, "ko", 2) ||
+            !g_ascii_strncasecmp(locale, "zh", 2))) {
                ATTACH_ROW(_("Last Name"), entry_ln);
                ATTACH_ROW(_("First Name"), entry_fn);
        } else {
@@ -598,6 +745,46 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
        personeditdlg.entry_nick  = entry_nn;
 }
 
+static gboolean email_adding = FALSE, email_saving = FALSE;
+
+static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
+{
+       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_email), 0) != NULL;
+
+       if (personeditdlg.read_only)
+               return;
+
+       if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)) == NULL
+       ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email))) == 0) {
+               gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_mod,FALSE);
+               email_adding = FALSE;
+               email_saving = FALSE;
+       } else if (list_find_email(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)))) {
+               gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
+               email_adding = FALSE;
+               email_saving = non_empty;
+       } else {
+               gtk_widget_set_sensitive(personeditdlg.email_add,TRUE);
+               gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
+               email_adding = TRUE;
+               email_saving = non_empty;
+       }
+}
+
+static gboolean edit_person_entry_email_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Return) {
+               if (email_saving)
+                       edit_person_email_modify(NULL);         
+               else if (email_adding)
+                       edit_person_email_add(NULL);
+       }
+       return FALSE;
+}
+
+
 static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        GtkWidget *vbox;
        GtkWidget *hbox;
@@ -609,7 +796,6 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        GtkWidget *buttonDel;
        GtkWidget *buttonMod;
        GtkWidget *buttonAdd;
-       GtkWidget *buttonClr;
 
        GtkWidget *table;
        GtkWidget *label;
@@ -623,7 +809,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gchar *titles[ EMAIL_N_COLS ];
        gint i;
 
-       titles[ EMAIL_COL_EMAIL   ] = _("E-Mail Address");
+       titles[ EMAIL_COL_EMAIL   ] = _("Email Address");
        titles[ EMAIL_COL_ALIAS   ] = _("Alias");
        titles[ EMAIL_COL_REMARKS ] = _("Remarks");
 
@@ -632,7 +818,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -651,7 +837,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC);
 
        clist = gtk_clist_new_with_titles( EMAIL_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
@@ -671,7 +857,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        /* First row */
        top = 0;
-       label = gtk_label_new(_("E-Mail Address"));
+       label = gtk_label_new(_("Email Address"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
@@ -702,51 +888,98 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 
        vbuttonbox = gtk_vbutton_box_new();
        gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
-       gtk_button_box_set_spacing( GTK_BUTTON_BOX(vbuttonbox), 8 );
+       gtk_box_set_spacing( GTK_BOX(vbuttonbox), 8 );
        gtk_container_set_border_width( GTK_CONTAINER(vbuttonbox), 4 );
        gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
 
        /* Buttons */
-       buttonUp = gtk_button_new_with_label( _( "Move Up" ) );
+       buttonUp = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
 
-       buttonDown = gtk_button_new_with_label( _( "Move Down" ) );
+       buttonDown = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
 
-       buttonDel = gtk_button_new_with_label( _( "Delete" ) );
+       buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
 
-       buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+       buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
 
-       buttonAdd = gtk_button_new_with_label( _( "Add" ) );
+       buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
 
-       buttonClr = gtk_button_new_with_label( _( "Clear" ) );
-       gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonClr );
-
        gtk_widget_show_all(vbox);
 
        /* Event handlers */
-       gtk_signal_connect( GTK_OBJECT(clist), "select_row",
-                       GTK_SIGNAL_FUNC( edit_person_email_list_selected), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonUp), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_move_up ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonDown), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_move_down ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonDel), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_delete ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonMod), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_modify ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonAdd), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_add ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonClr), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_email_clear ), NULL );
+       g_signal_connect( G_OBJECT(clist), "select_row",
+                         G_CALLBACK( edit_person_email_list_selected), NULL );
+       g_signal_connect( G_OBJECT(buttonUp), "clicked",
+                         G_CALLBACK( edit_person_email_move_up ), NULL );
+       g_signal_connect( G_OBJECT(buttonDown), "clicked",
+                         G_CALLBACK( edit_person_email_move_down ), NULL );
+       g_signal_connect( G_OBJECT(buttonDel), "clicked",
+                         G_CALLBACK( edit_person_email_delete ), NULL );
+       g_signal_connect( G_OBJECT(buttonMod), "clicked",
+                         G_CALLBACK( edit_person_email_modify ), NULL );
+       g_signal_connect( G_OBJECT(buttonAdd), "clicked",
+                         G_CALLBACK( edit_person_email_add ), NULL );
+       g_signal_connect(G_OBJECT(entry_email), "changed",
+                        G_CALLBACK(edit_person_entry_email_changed), NULL);
+       g_signal_connect(G_OBJECT(entry_email), "key_press_event",
+                        G_CALLBACK(edit_person_entry_email_pressed), NULL);
+       g_signal_connect(G_OBJECT(entry_alias), "key_press_event",
+                        G_CALLBACK(edit_person_entry_email_pressed), NULL);
+       g_signal_connect(G_OBJECT(entry_remarks), "key_press_event",
+                        G_CALLBACK(edit_person_entry_email_pressed), NULL);
 
        personeditdlg.clist_email   = clist;
        personeditdlg.entry_email   = entry_email;
        personeditdlg.entry_alias   = entry_alias;
        personeditdlg.entry_remarks = entry_remarks;
+       personeditdlg.email_up = buttonUp;
+       personeditdlg.email_down = buttonDown;
+       personeditdlg.email_del = buttonDel;
+       personeditdlg.email_mod = buttonMod;
+       personeditdlg.email_add = buttonAdd;
+}
+
+static gboolean attrib_adding = FALSE, attrib_saving = FALSE;
+
+static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
+{
+       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_attrib), 0) != NULL;
+
+       if (personeditdlg.read_only || personeditdlg.ldap)
+               return;
+
+       if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)) == NULL
+       ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname))) == 0) {
+               gtk_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.attrib_mod,FALSE);
+               attrib_adding = FALSE;
+               attrib_saving = FALSE;
+       } else if (list_find_attribute(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)))) {
+               gtk_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
+               attrib_adding = FALSE;
+               attrib_saving = non_empty;
+       } else {
+               gtk_widget_set_sensitive(personeditdlg.attrib_add,TRUE);
+               gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
+               attrib_adding = TRUE;
+               attrib_saving = non_empty;
+       }
+}
+
+static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Return) {
+               if (attrib_saving)
+                       edit_person_attrib_modify(NULL);
+               else if (attrib_adding)
+                       edit_person_attrib_add(NULL);
+       }
+       return FALSE;
 }
 
 static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) {
@@ -758,7 +991,6 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        GtkWidget *buttonDel;
        GtkWidget *buttonMod;
        GtkWidget *buttonAdd;
-       GtkWidget *buttonClr;
 
        GtkWidget *table;
        GtkWidget *label;
@@ -779,7 +1011,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
        gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
 
-       label = gtk_label_new( pageLbl );
+       label = gtk_label_new_with_mnemonic( pageLbl );
        gtk_widget_show( label );
        gtk_notebook_set_tab_label(
                GTK_NOTEBOOK( personeditdlg.notebook ),
@@ -798,7 +1030,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC);
 
        clist = gtk_clist_new_with_titles( ATTRIB_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
@@ -842,48 +1074,64 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 
        vbuttonbox = gtk_vbutton_box_new();
        gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
-       gtk_button_box_set_spacing( GTK_BUTTON_BOX(vbuttonbox), 8 );
+       gtk_box_set_spacing( GTK_BOX(vbuttonbox), 8 );
        gtk_container_set_border_width( GTK_CONTAINER(vbuttonbox), 4 );
        gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
 
        /* Buttons */
-       buttonDel = gtk_button_new_with_label( _( "Delete" ) );
+       buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
 
-       buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+       buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
 
-       buttonAdd = gtk_button_new_with_label( _( "Add" ) );
+       buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
-
-       buttonClr = gtk_button_new_with_label( _( "Clear" ) );
-       gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonClr );
+       
+       gtk_widget_set_sensitive(buttonDel,FALSE);
+       gtk_widget_set_sensitive(buttonMod,FALSE);
+       gtk_widget_set_sensitive(buttonAdd,FALSE);
 
        gtk_widget_show_all(vbox);
 
        /* Event handlers */
-       gtk_signal_connect( GTK_OBJECT(clist), "select_row",
-                       GTK_SIGNAL_FUNC( edit_person_attrib_list_selected), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonDel), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_attrib_delete ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonMod), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_attrib_modify ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonAdd), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_attrib_add ), NULL );
-       gtk_signal_connect( GTK_OBJECT(buttonClr), "clicked",
-                       GTK_SIGNAL_FUNC( edit_person_attrib_clear ), NULL );
+       g_signal_connect( G_OBJECT(clist), "select_row",
+                         G_CALLBACK( edit_person_attrib_list_selected), NULL );
+       g_signal_connect( G_OBJECT(buttonDel), "clicked",
+                         G_CALLBACK( edit_person_attrib_delete ), NULL );
+       g_signal_connect( G_OBJECT(buttonMod), "clicked",
+                         G_CALLBACK( edit_person_attrib_modify ), NULL );
+       g_signal_connect( G_OBJECT(buttonAdd), "clicked",
+                         G_CALLBACK( edit_person_attrib_add ), NULL );
+       g_signal_connect(G_OBJECT(entry_name), "changed",
+                        G_CALLBACK(edit_person_entry_att_changed), NULL);
+       g_signal_connect(G_OBJECT(entry_name), "key_press_event",
+                        G_CALLBACK(edit_person_entry_att_pressed), NULL);
+       g_signal_connect(G_OBJECT(entry_value), "key_press_event",
+                        G_CALLBACK(edit_person_entry_att_pressed), NULL);
 
        personeditdlg.clist_attrib  = clist;
        personeditdlg.entry_atname  = entry_name;
        personeditdlg.entry_atvalue = entry_value;
+       personeditdlg.attrib_add = buttonAdd;
+       personeditdlg.attrib_del = buttonDel;
+       personeditdlg.attrib_mod = buttonMod;
 }
 
-static void addressbook_edit_person_create( gboolean *cancelled ) {
-       addressbook_edit_person_dialog_create( cancelled );
-       addressbook_edit_person_page_basic( PAGE_BASIC, _( "Basic Data" ) );
-       addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Address" ) );
-       addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "User Attributes" ) );
-       gtk_widget_show_all( personeditdlg.window );
+static void addressbook_edit_person_create( GtkWidget *parent, gboolean *cancelled ) {
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_dialog_create( cancelled );
+       else
+               addressbook_edit_person_widgetset_create( parent, cancelled );
+       addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) );
+       addressbook_edit_person_page_email( PAGE_EMAIL, _( "_Email Addresses" ) );
+#ifdef USE_LDAP
+       if (personeditdlg.ldap)
+               addressbook_edit_person_page_attrib_ldap(&personeditdlg, PAGE_ATTRIBUTES, _("O_ther Attributes"));
+       else
+#endif
+               addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "O_ther Attributes" ) );
+       gtk_widget_show_all( personeditdlg.container );
 }
 
 /*
@@ -916,6 +1164,133 @@ static GList *edit_person_build_attrib_list() {
        return listAttrib;
 }
 
+static void update_sensitivity(void)
+{
+       gtk_widget_set_sensitive(personeditdlg.entry_name,    !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_first,   !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_last,    !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_nick,    !personeditdlg.read_only && !personeditdlg.ldap);
+       gtk_widget_set_sensitive(personeditdlg.entry_email,   !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_alias,   !personeditdlg.read_only && !personeditdlg.ldap);
+       gtk_widget_set_sensitive(personeditdlg.entry_remarks, !personeditdlg.read_only && !personeditdlg.ldap);
+       gtk_widget_set_sensitive(personeditdlg.email_up,      !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.email_down,    !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.email_del,     !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.email_mod,     !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.email_add,     !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_atname,  !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.entry_atvalue, !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.attrib_add,    !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.attrib_del,    !personeditdlg.read_only);
+       gtk_widget_set_sensitive(personeditdlg.attrib_mod,    !personeditdlg.read_only);
+}
+
+static void addressbook_edit_person_flush_transient( void )
+{
+       ItemPerson *person = current_person;
+       EditAddressPostUpdateCallback callback = edit_person_close_post_update_cb;
+
+       /* reset transient data */
+       current_abf = NULL;
+       current_person = NULL;
+       current_parent_folder = NULL;
+       edit_person_close_post_update_cb = NULL;
+
+       /* post action to perform on addressbook side */
+       if (callback)
+               callback( person );
+}
+
+void addressbook_edit_person_invalidate( AddressBookFile *abf, ItemFolder *parent_folder,
+                                                                                ItemPerson *person )
+{
+       if (current_abf == NULL &&
+               current_person == NULL &&
+               current_parent_folder == NULL)
+               /* edit address form is already hidden */
+               return;
+
+       /* unconditional invalidation or invalidating the currently edited item */
+       if ( ( abf == NULL && person == NULL && parent_folder == NULL )
+               || (current_abf == abf ||
+                       current_person == person ||
+                       current_parent_folder == parent_folder))
+               addressbook_edit_person_close( TRUE );
+}
+
+static gboolean addressbook_edit_person_close( gboolean cancelled )
+{
+       GList *listEMail = NULL;
+       GList *listAttrib = NULL;
+       gchar *cn = NULL;
+
+       listEMail = edit_person_build_email_list();
+       listAttrib = edit_person_build_attrib_list();
+       if( cancelled ) {
+               addritem_free_list_email( listEMail );
+               addritem_free_list_attribute( listAttrib );
+               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+
+               if (!prefs_common.addressbook_use_editaddress_dialog)
+                       gtk_widget_hide( personeditdlg.container );
+
+               /* no callback, as we're discarding the form */
+               edit_person_close_post_update_cb = NULL;
+               addressbook_edit_person_flush_transient();
+
+               /* set focus to the address list (this is done by the post_update_cb usually) */
+               addressbook_address_list_set_focus();
+               return FALSE;
+       }
+
+       cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+       if( current_person && current_abf ) {
+               /* Update email/attribute list for existing current_person */
+               addrbook_update_address_list( current_abf, current_person, listEMail );
+               addrbook_update_attrib_list( current_abf, current_person, listAttrib );
+       }
+       else {
+               /* Create new current_person and email/attribute list */
+               if( cn == NULL || *cn == '\0' ) {
+                       /* Wasting our time */
+                       if( listEMail == NULL && listAttrib == NULL ) cancelled = TRUE;
+               }
+               if( ! cancelled && current_abf ) {
+                       current_person = addrbook_add_address_list( current_abf, current_parent_folder, listEMail );
+                       addrbook_add_attrib_list( current_abf, current_person, listAttrib );
+               }
+       }
+       listEMail = NULL;
+       listAttrib = NULL;
+
+       if( ! cancelled ) {
+               /* Set current_person stuff */
+               gchar *name;
+               addritem_person_set_common_name( current_person, cn );
+               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
+               addritem_person_set_first_name( current_person, name );
+               g_free( name );
+               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
+               addritem_person_set_last_name( current_person, name );
+               g_free( name );
+               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
+               addritem_person_set_nick_name( current_person, name );
+               g_free( name );
+       }
+       g_free( cn );
+
+       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               gtk_widget_hide( personeditdlg.container );
+
+       addressbook_edit_person_flush_transient();
+
+       return TRUE;
+}
 /*
 * Edit person.
 * Enter: abf    Address book.
@@ -925,18 +1300,37 @@ static GList *edit_person_build_attrib_list() {
 *        pgMail If TRUE, E-Mail page will be activated.
 * Return: Edited object, or NULL if cancelled.
 */
-ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, ItemPerson *person, gboolean pgMail ) {
+ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_folder, ItemPerson *person,
+                                                                        gboolean pgMail, GtkWidget *parent_container,
+                                                                        void (*post_update_cb) (ItemPerson *person),
+                                                                        gboolean get_focus) {
        static gboolean cancelled;
-       GList *listEMail = NULL;
-       GList *listAttrib = NULL;
-       gchar *cn = NULL;
 
-       if (!personeditdlg.window)
-               addressbook_edit_person_create(&cancelled);
-       gtk_widget_grab_focus(personeditdlg.ok_btn);
-       gtk_widget_grab_focus(personeditdlg.entry_name);
-       gtk_widget_show(personeditdlg.window);
-       manage_window_set_transient(GTK_WINDOW(personeditdlg.window));
+       /* set transient data */
+       current_abf = abf;
+       current_person = person;
+       current_parent_folder = parent_folder;
+       edit_person_close_post_update_cb = post_update_cb;
+       personeditdlg.ldap = (abf->type == ADBOOKTYPE_LDAP)? TRUE : FALSE;
+
+       if( !personeditdlg.container )
+               addressbook_edit_person_create(parent_container, &cancelled);
+
+       /* typically, get focus when dialog mode is enabled, or when editing a new address */
+       if( get_focus ) {
+               gtk_widget_grab_focus(personeditdlg.ok_btn);
+               gtk_widget_grab_focus(personeditdlg.entry_name);
+       }
+       
+       personeditdlg.read_only = (current_abf == NULL);
+       update_sensitivity();
+
+       gtk_widget_show(personeditdlg.container);
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               manage_window_set_transient(GTK_WINDOW(personeditdlg.container));
+       else
+               if (get_focus)
+                       addressbook_address_list_disable_some_actions();
 
        /* Clear all fields */
        personeditdlg.rowIndEMail = -1;
@@ -961,6 +1355,7 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, I
                        gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_nick), person->nickName );
                edit_person_load_email( person );
                edit_person_load_attrib( person );
+               gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_atvalue), "");
        }
        else {
                personeditdlg.editNew = TRUE;
@@ -968,10 +1363,10 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, I
 
        /* Select appropriate start page */
        if( pgMail ) {
-               gtk_notebook_set_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_EMAIL );
+               gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_EMAIL );
        }
        else {
-               gtk_notebook_set_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
+               gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
        }
 
        gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_email), 0, 0 );
@@ -982,57 +1377,14 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, I
 
        edit_person_attrib_clear( NULL );
 
-       gtk_main();
-       gtk_widget_hide( personeditdlg.window );
-
-       listEMail = edit_person_build_email_list();
-       listAttrib = edit_person_build_attrib_list();
-       if( cancelled ) {
-               addritem_free_list_email( listEMail );
-               addritem_free_list_attribute( listAttrib );
-               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
-               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
-               return NULL;
-       }
+       if (prefs_common.addressbook_use_editaddress_dialog) {
 
-       cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
-       if( person ) {
-               /* Update email/attribute list for existing person */
-               addrbook_update_address_list( abf, person, listEMail );
-               addrbook_update_attrib_list( abf, person, listAttrib );
-       }
-       else {
-               /* Create new person and email/attribute list */
-               if( cn == NULL || *cn == '\0' ) {
-                       /* Wasting our time */
-                       if( listEMail == NULL && listAttrib == NULL ) cancelled = TRUE;
-               }
-               if( ! cancelled ) {
-                       person = addrbook_add_address_list( abf, parent, listEMail );
-                       addrbook_add_attrib_list( abf, person, listAttrib );
-               }
-       }
-       listEMail = NULL;
-       listAttrib = NULL;
+       gtk_main();
+               gtk_widget_hide( personeditdlg.container );
 
-       if( ! cancelled ) {
-               /* Set person stuff */
-               gchar *name;
-               addritem_person_set_common_name( person, cn );
-               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
-               addritem_person_set_first_name( person, name );
-               g_free( name );
-               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
-               addritem_person_set_last_name( person, name );
-               g_free( name );
-               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
-               addritem_person_set_nick_name( person, name );
-               g_free( name );
+               if (!addressbook_edit_person_close( cancelled ))
+                       return NULL;
        }
-       g_free( cn );
-
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
 
        return person;
 }