Initial import of Sylpheed (GTK2 version).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 1198 insertions, 0 deletions

diff --git a/src/editaddress.c b/src/editaddress.c
new file mode 100644
index 00000000..35c57d20
--- /dev/null
+++ b/src/editaddress.c
@@ -0,0 +1,1198 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "defs.h"
+
+#include <glib.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtktable.h>
+
+#include "intl.h"
+#include "mgutils.h"
+#include "addressbook.h"
+#include "addressitem.h"
+#include "addritem.h"
+#include "addrbook.h"
+#include "manage_window.h"
+#include "gtkutils.h"
+#include "codeconv.h"
+
+#include "prefs_common.h"
+
+/*
+static struct _AddressEdit_dlg {
+	GtkWidget *window;
+	GtkWidget *name_entry;
+	GtkWidget *addr_entry;
+	GtkWidget *rem_entry;
+	GtkWidget *ok_btn;
+	GtkWidget *cancel_btn;
+} addredit;
+*/
+
+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;
+
+typedef enum {
+	EMAIL_COL_EMAIL   = 0,
+	EMAIL_COL_ALIAS   = 1,
+	EMAIL_COL_REMARKS = 2
+} PersonEditEMailColumnPos;
+
+typedef enum {
+	ATTRIB_COL_NAME    = 0,
+	ATTRIB_COL_VALUE   = 1
+} PersonEditAttribColumnPos;
+
+#define EDITPERSON_WIDTH      520
+#define EDITPERSON_HEIGHT     340
+
+#define EMAIL_N_COLS          3
+#define EMAIL_COL_WIDTH_EMAIL 180
+#define EMAIL_COL_WIDTH_ALIAS 80
+
+#define ATTRIB_N_COLS          2
+#define ATTRIB_COL_WIDTH_NAME  120
+#define ATTRIB_COL_WIDTH_VALUE 180
+
+#define PAGE_BASIC             0
+#define PAGE_EMAIL             1
+#define PAGE_ATTRIBUTES        2
+
+#if 0
+#define SET_LABEL_AND_ENTRY(str, entry, top) \
+{ \
+	label = gtk_label_new(str); \
+	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); \
+ \
+	entry = gtk_entry_new(); \
+	gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \
+			 GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); \
+}
+
+static void edit_address_ok(GtkWidget *widget, gboolean *cancelled)
+{
+	*cancelled = FALSE;
+	gtk_main_quit();
+}
+
+static void edit_address_cancel(GtkWidget *widget, gboolean *cancelled)
+{
+	*cancelled = TRUE;
+	gtk_main_quit();
+}
+
+static gint edit_address_delete_event(GtkWidget *widget, GdkEventAny *event,
+				      gboolean *cancelled)
+{
+	*cancelled = TRUE;
+	gtk_main_quit();
+
+	return TRUE;
+}
+
+static gboolean edit_address_key_pressed(GtkWidget *widget, GdkEventKey *event,
+					 gboolean *cancelled)
+{
+	if (event && event->keyval == GDK_Escape) {
+		*cancelled = TRUE;
+		gtk_main_quit();
+	}
+	return FALSE;
+}
+
+static void addressbook_edit_address_create(gboolean *cancelled)
+{
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *name_entry;
+	GtkWidget *addr_entry;
+	GtkWidget *rem_entry;
+	GtkWidget *hbbox;
+	GtkWidget *ok_btn;
+	GtkWidget *cancel_btn;
+
+	debug_print("Creating edit_address window...\n");
+
+	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	gtk_widget_set_size_request(window, 400, -1);
+	/* gtk_container_set_border_width(GTK_CONTAINER(window), 8); */
+	gtk_window_set_title(GTK_WINDOW(window), _("Edit address"));
+	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_address_delete_event),
+			 cancelled);
+	g_signal_connect(G_OBJECT(window), "key_press_event",
+			 G_CALLBACK(edit_address_key_pressed),
+			 cancelled);
+
+	vbox = gtk_vbox_new(FALSE, 8);
+	gtk_container_add(GTK_CONTAINER(window), vbox);
+
+	table = gtk_table_new(3, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+	SET_LABEL_AND_ENTRY(_("Name"),    name_entry, 0);
+	SET_LABEL_AND_ENTRY(_("Address"), addr_entry, 1);
+	SET_LABEL_AND_ENTRY(_("Remarks"), rem_entry,  2);
+
+	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
+				&cancel_btn, _("Cancel"), NULL, NULL);
+	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
+	gtk_widget_grab_default(ok_btn);
+
+	g_signal_connect(G_OBJECT(ok_btn), "clicked",
+			 G_CALLBACK(edit_address_ok), cancelled);
+	g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+			 G_CALLBACK(edit_address_cancel), cancelled);
+
+	gtk_widget_show_all(vbox);
+
+	addredit.window     = window;
+	addredit.name_entry = name_entry;
+	addredit.addr_entry = addr_entry;
+	addredit.rem_entry  = rem_entry;
+	addredit.ok_btn     = ok_btn;
+	addredit.cancel_btn = cancel_btn;
+}
+
+AddressItem *addressbook_edit_address(AddressItem *item)
+{
+	static gboolean cancelled;
+	const gchar *str;
+
+	if (!addredit.window)
+		addressbook_edit_address_create(&cancelled);
+	gtk_widget_grab_focus(addredit.ok_btn);
+	gtk_widget_grab_focus(addredit.name_entry);
+	gtk_widget_show(addredit.window);
+	manage_window_set_transient(GTK_WINDOW(addredit.window));
+
+	gtk_entry_set_text(GTK_ENTRY(addredit.name_entry), "");
+	gtk_entry_set_text(GTK_ENTRY(addredit.addr_entry), "");
+	gtk_entry_set_text(GTK_ENTRY(addredit.rem_entry),  "");
+
+	if (item) {
+		if (ADDRESS_OBJECT_NAME(item))
+			gtk_entry_set_text(GTK_ENTRY(addredit.name_entry),
+					   ADDRESS_OBJECT_NAME(item));
+		if (item->address)
+			gtk_entry_set_text(GTK_ENTRY(addredit.addr_entry),
+					   item->address);
+		if (item->remarks)
+			gtk_entry_set_text(GTK_ENTRY(addredit.rem_entry),
+					   item->remarks);
+	}
+
+	gtk_main();
+	gtk_widget_hide(addredit.window);
+	if (cancelled == TRUE) return NULL;
+
+	str = gtk_entry_get_text(GTK_ENTRY(addredit.name_entry));
+	if (*str == '\0') return NULL;
+
+	if (!item) {
+		item = mgu_create_address();
+		ADDRESS_OBJECT_TYPE(item) = ADDR_ITEM;
+	}
+
+	g_free(ADDRESS_OBJECT_NAME(item));
+	ADDRESS_OBJECT_NAME(item) = g_strdup(str);
+
+	str = gtk_entry_get_text(GTK_ENTRY(addredit.addr_entry));
+	g_free(item->address);
+	if (*str == '\0')
+		item->address = NULL;
+	else
+		item->address = g_strdup(str);
+
+	str = gtk_entry_get_text(GTK_ENTRY(addredit.rem_entry));
+	g_free(item->remarks);
+	if (*str == '\0')
+		item->remarks = NULL;
+	else
+		item->remarks = g_strdup(str);
+
+	return item;
+}
+#endif /* 0 */
+
+static void edit_person_status_show( gchar *msg ) {
+	if( personeditdlg.statusbar != NULL ) {
+		gtk_statusbar_pop( GTK_STATUSBAR(personeditdlg.statusbar), personeditdlg.status_cid );
+		if( msg ) {
+			gtk_statusbar_push( GTK_STATUSBAR(personeditdlg.statusbar), personeditdlg.status_cid, msg );
+		}
+	}
+}
+
+static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
+	*cancelled = FALSE;
+	gtk_main_quit();
+}
+
+static void edit_person_cancel(GtkWidget *widget, gboolean *cancelled) {
+	*cancelled = TRUE;
+	gtk_main_quit();
+}
+
+static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboolean *cancelled) {
+	*cancelled = TRUE;
+	gtk_main_quit();
+	return TRUE;
+}
+
+static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+	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_window_title( gint pageNum ) {
+	gchar *sTitle;
+
+	if( _title_new_ == NULL ) {
+		_title_new_ = g_strdup( _("Add New Person") );
+		_title_edit_ = g_strdup( _("Edit Person Details") );
+	}
+
+	if( pageNum == PAGE_BASIC ) {
+		if( personeditdlg.editNew ) {
+			gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_new_ );
+		}
+		else {
+			gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_edit_ );
+		}
+	}
+	else {
+		if( personeditdlg.entry_name == NULL ) {
+			sTitle = g_strdup( _title_edit_ );
+		}
+		else {
+			gchar *name;
+			name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+			sTitle = g_strdup_printf( "%s - %s", _title_edit_, name );
+			g_free( name );
+		}
+		gtk_window_set_title( GTK_WINDOW(personeditdlg.window), sTitle );
+		g_free( sTitle );
+	}
+}
+
+static void edit_person_email_clear( gpointer data ) {
+	gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_email), "" );
+	gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_alias), "" );
+	gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_remarks), "" );
+}
+
+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), "" );
+}
+
+static void edit_person_switch_page( GtkNotebook *notebook, GtkNotebookPage *page,
+					gint pageNum, gpointer user_data)
+{
+	edit_person_set_window_title( pageNum );
+	edit_person_status_show( "" );
+}
+
+/*
+* Load clist with a copy of person's email addresses.
+*/
+void edit_person_load_email( ItemPerson *person ) {
+	GList *node = person->listEMail;
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	gchar *text[ EMAIL_N_COLS ];
+	while( node ) {
+		ItemEMail *emorig = ( ItemEMail * ) node->data;
+		ItemEMail *email = addritem_copy_item_email( emorig );
+		gint row;
+		text[ EMAIL_COL_EMAIL   ] = email->address;
+		text[ EMAIL_COL_ALIAS   ] = email->obj.name;
+		text[ EMAIL_COL_REMARKS ] = email->remarks;
+
+		row = gtk_clist_append( clist, text );
+		gtk_clist_set_row_data( clist, row, email );
+		node = g_list_next( node );
+	}
+}
+
+static void edit_person_email_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
+	ItemEMail *email = gtk_clist_get_row_data( clist, row );
+	if( email ) {
+		if( email->address )
+			gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_email), email->address );
+		if( ADDRITEM_NAME(email) )
+			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 );
+	}
+	personeditdlg.rowIndEMail = row;
+	edit_person_status_show( NULL );
+}
+
+static void edit_person_email_move( gint dir ) {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	gint row = personeditdlg.rowIndEMail + dir;
+	ItemEMail *email = gtk_clist_get_row_data( clist, row );
+	if( email ) {
+		gtk_clist_row_move( clist, personeditdlg.rowIndEMail, row );
+		personeditdlg.rowIndEMail = row;
+	}
+	edit_person_email_clear( NULL );
+	edit_person_status_show( NULL );
+}
+
+static void edit_person_email_move_up( gpointer data ) {
+	edit_person_email_move( -1 );
+}
+
+static void edit_person_email_move_down( gpointer data ) {
+	edit_person_email_move( +1 );
+}
+
+static void edit_person_email_delete( gpointer data ) {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	gint row = personeditdlg.rowIndEMail;
+	ItemEMail *email = gtk_clist_get_row_data( clist, row );
+	edit_person_email_clear( NULL );
+	if( email ) {
+		/* Remove list entry */
+		gtk_clist_remove( clist, row );
+		addritem_free_item_email( email );
+		email = NULL;
+	}
+
+	/* Position hilite bar */
+	email = gtk_clist_get_row_data( clist, row );
+	if( ! email ) {
+		personeditdlg.rowIndEMail = -1 + row;
+	}
+	edit_person_status_show( NULL );
+}
+
+static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
+	ItemEMail *retVal = NULL;
+	gchar *sEmail, *sAlias, *sRemarks, *sEmail_;
+
+	*error = TRUE;
+	sEmail_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_email), 0, -1 );
+	sAlias = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_alias), 0, -1 );
+	sRemarks = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_remarks), 0, -1 );
+	sEmail = mgu_email_check_empty( sEmail_ );
+	g_free( sEmail_ );
+
+	if( sEmail ) {
+		if( email == NULL ) {
+			email = addritem_create_item_email();
+		}
+		addritem_email_set_address( email, sEmail );
+		addritem_email_set_alias( email, sAlias );
+		addritem_email_set_remarks( email, sRemarks );
+		retVal = email;
+		*error = FALSE;
+	}
+	else {
+		edit_person_status_show( _( "An E-Mail address must be supplied." ) );
+	}
+
+	g_free( sEmail );
+	g_free( sAlias );
+	g_free( sRemarks );
+
+	return retVal;
+}
+
+static void edit_person_email_modify( gpointer data ) {
+	gboolean errFlg = FALSE;
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	gint row = personeditdlg.rowIndEMail;
+	ItemEMail *email = gtk_clist_get_row_data( clist, row );
+	if( email ) {
+		edit_person_email_edit( &errFlg, email );
+		if( ! errFlg ) {
+			gtk_clist_set_text( clist, row, EMAIL_COL_EMAIL, email->address );
+			gtk_clist_set_text( clist, row, EMAIL_COL_ALIAS, email->obj.name );
+			gtk_clist_set_text( clist, row, EMAIL_COL_REMARKS, email->remarks );
+			edit_person_email_clear( NULL );
+		}
+	}
+}
+
+static void edit_person_email_add( gpointer data ) {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	gboolean errFlg = FALSE;
+	ItemEMail *email = NULL;
+	gint row = personeditdlg.rowIndEMail;
+	if( gtk_clist_get_row_data( clist, row ) == NULL ) row = 0;
+
+	email = edit_person_email_edit( &errFlg, NULL );
+	if( ! errFlg ) {
+		gchar *text[ EMAIL_N_COLS ];
+		text[ EMAIL_COL_EMAIL   ] = email->address;
+		text[ EMAIL_COL_ALIAS   ] = email->obj.name;
+		text[ EMAIL_COL_REMARKS ] = email->remarks;
+
+		row = gtk_clist_insert( clist, 1 + row, text );
+		gtk_clist_set_row_data( clist, row, email );
+		gtk_clist_select_row( clist, row, 0 );
+		edit_person_email_clear( NULL );
+	}
+}
+
+/*
+* Load clist with a copy of person's email addresses.
+*/
+void edit_person_load_attrib( ItemPerson *person ) {
+	GList *node = person->listAttrib;
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+	gchar *text[ ATTRIB_N_COLS ];
+	while( node ) {
+		UserAttribute *atorig = ( UserAttribute * ) node->data;
+		UserAttribute *attrib = addritem_copy_attribute( atorig );
+		gint row;
+		text[ ATTRIB_COL_NAME  ] = attrib->name;
+		text[ ATTRIB_COL_VALUE ] = attrib->value;
+
+		row = gtk_clist_append( clist, text );
+		gtk_clist_set_row_data( clist, row, attrib );
+		node = g_list_next( node );
+	}
+}
+
+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 ) {
+		gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), attrib->name );
+		gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), attrib->value );
+	}
+	personeditdlg.rowIndAttrib = row;
+	edit_person_status_show( NULL );
+}
+
+static void edit_person_attrib_delete( gpointer data ) {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+	gint row = personeditdlg.rowIndAttrib;
+	UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
+	edit_person_attrib_clear( NULL );
+	if( attrib ) {
+		/* Remove list entry */
+		gtk_clist_remove( clist, row );
+		addritem_free_attribute( attrib );
+		attrib = NULL;
+	}
+
+	/* Position hilite bar */
+	attrib = gtk_clist_get_row_data( clist, row );
+	if( ! attrib ) {
+		personeditdlg.rowIndAttrib = -1 + row;
+	}
+	edit_person_status_show( NULL );
+}
+
+static UserAttribute *edit_person_attrib_edit( gboolean *error, UserAttribute *attrib ) {
+	UserAttribute *retVal = NULL;
+	gchar *sName, *sValue, *sName_, *sValue_;
+
+	*error = TRUE;
+	sName_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atname), 0, -1 );
+	sValue_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atvalue), 0, -1 );
+	sName = mgu_email_check_empty( sName_ );
+	sValue = mgu_email_check_empty( sValue_ );
+	g_free( sName_ );
+	g_free( sValue_ );
+
+	if( sName && sValue ) {
+		if( attrib == NULL ) {
+			attrib = addritem_create_attribute();
+		}
+		addritem_attrib_set_name( attrib, sName );
+		addritem_attrib_set_value( attrib, sValue );
+		retVal = attrib;
+		*error = FALSE;
+	}
+	else {
+		edit_person_status_show( _( "A Name and Value must be supplied." ) );
+	}
+
+	g_free( sName );
+	g_free( sValue );
+
+	return retVal;
+}
+
+static void edit_person_attrib_modify( gpointer data ) {
+	gboolean errFlg = FALSE;
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+	gint row = personeditdlg.rowIndAttrib;
+	UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
+	if( attrib ) {
+		edit_person_attrib_edit( &errFlg, attrib );
+		if( ! errFlg ) {
+			gtk_clist_set_text( clist, row, ATTRIB_COL_NAME, attrib->name );
+			gtk_clist_set_text( clist, row, ATTRIB_COL_VALUE, attrib->value );
+			edit_person_attrib_clear( NULL );
+		}
+	}
+}
+
+static void edit_person_attrib_add( gpointer data ) {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+	gboolean errFlg = FALSE;
+	UserAttribute *attrib = NULL;
+	gint row = personeditdlg.rowIndAttrib;
+	if( gtk_clist_get_row_data( clist, row ) == NULL ) row = 0;
+
+	attrib = edit_person_attrib_edit( &errFlg, NULL );
+	if( ! errFlg ) {
+		gchar *text[ EMAIL_N_COLS ];
+		text[ ATTRIB_COL_NAME  ] = attrib->name;
+		text[ ATTRIB_COL_VALUE ] = attrib->value;
+
+		row = gtk_clist_insert( clist, 1 + row, text );
+		gtk_clist_set_row_data( clist, row, attrib );
+		gtk_clist_select_row( clist, row, 0 );
+		edit_person_attrib_clear( NULL );
+	}
+}
+
+static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *vnbox;
+	GtkWidget *notebook;
+	GtkWidget *hbbox;
+	GtkWidget *ok_btn;
+	GtkWidget *cancel_btn;
+	GtkWidget *hsbox;
+	GtkWidget *statusbar;
+
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_widget_set_size_request(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);	
+	g_signal_connect(G_OBJECT(window), "delete_event",
+			 G_CALLBACK(edit_person_delete_event),
+			 cancelled);
+	g_signal_connect(G_OBJECT(window), "key_press_event",
+			 G_CALLBACK(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);
+
+	vnbox = gtk_vbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
+	gtk_widget_show(vnbox);
+	gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
+
+	/* Notebook */
+	notebook = gtk_notebook_new();
+	gtk_widget_show(notebook);
+	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);
+	gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
+	gtk_widget_grab_default(ok_btn);
+
+	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;
+	personeditdlg.statusbar  = statusbar;
+	personeditdlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Person Dialog" );
+
+}
+
+void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *entry_name;
+	GtkWidget *entry_fn;
+	GtkWidget *entry_ln;
+	GtkWidget *entry_nn;
+	const gchar *locale;
+	gint top = 0;
+
+	vbox = gtk_vbox_new( FALSE, 8 );
+	gtk_widget_show( vbox );
+	gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( personeditdlg.notebook ),
+		gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
+
+	table = gtk_table_new( 4, 3, FALSE);
+	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+	gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
+	gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+#define ATTACH_ROW(text, entry) \
+{ \
+	label = gtk_label_new(text); \
+	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); \
+ \
+	entry = gtk_entry_new(); \
+	gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \
+			 GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); \
+	top++; \
+}
+
+	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))) {
+		ATTACH_ROW(_("Last Name"), entry_ln);
+		ATTACH_ROW(_("First Name"), entry_fn);
+	} else {
+		ATTACH_ROW(_("First Name"), entry_fn);
+		ATTACH_ROW(_("Last Name"), entry_ln);
+	}
+	ATTACH_ROW(_("Nick Name"), entry_nn);
+
+#undef ATTACH_ROW
+
+	gtk_widget_show_all(vbox);
+
+	personeditdlg.entry_name  = entry_name;
+	personeditdlg.entry_first = entry_fn;
+	personeditdlg.entry_last  = entry_ln;
+	personeditdlg.entry_nick  = entry_nn;
+}
+
+void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *hbox;
+	GtkWidget *vboxl;
+	GtkWidget *vboxb;
+	GtkWidget *vbuttonbox;
+	GtkWidget *buttonUp;
+	GtkWidget *buttonDown;
+	GtkWidget *buttonDel;
+	GtkWidget *buttonMod;
+	GtkWidget *buttonAdd;
+	GtkWidget *buttonClr;
+
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *clist_swin;
+	GtkWidget *clist;
+	GtkWidget *entry_email;
+	GtkWidget *entry_alias;
+	GtkWidget *entry_remarks;
+	gint top;
+
+	gchar *titles[ EMAIL_N_COLS ];
+	gint i;
+
+	titles[ EMAIL_COL_EMAIL   ] = _("E-Mail Address");
+	titles[ EMAIL_COL_ALIAS   ] = _("Alias");
+	titles[ EMAIL_COL_REMARKS ] = _("Remarks");
+
+	vbox = gtk_vbox_new( FALSE, 8 );
+	gtk_widget_show( vbox );
+	gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( personeditdlg.notebook ),
+		gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
+
+	/* Split into two areas */
+	hbox = gtk_hbox_new( FALSE, 0 );
+	gtk_container_add( GTK_CONTAINER( vbox ), hbox );
+
+	/* EMail list */
+	vboxl = gtk_vbox_new( FALSE, 4 );
+	gtk_container_add( GTK_CONTAINER( hbox ), vboxl );
+	gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
+
+	/* Address list */
+	clist_swin = gtk_scrolled_window_new( NULL, NULL );
+	gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_ALWAYS);
+
+	clist = gtk_clist_new_with_titles( EMAIL_N_COLS, titles );
+	gtk_container_add( GTK_CONTAINER(clist_swin), clist );
+	gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
+	gtk_clist_set_column_width( GTK_CLIST(clist), EMAIL_COL_EMAIL, EMAIL_COL_WIDTH_EMAIL );
+	gtk_clist_set_column_width( GTK_CLIST(clist), EMAIL_COL_ALIAS, EMAIL_COL_WIDTH_ALIAS );
+
+	for( i = 0; i < EMAIL_N_COLS; i++ )
+		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+
+	/* Data entry area */
+	table = gtk_table_new( 4, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+	gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
+	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
+
+	/* First row */
+	top = 0;
+	label = gtk_label_new(_("E-Mail 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);
+
+	entry_email = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), entry_email, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Next row */
+	++top;
+	label = gtk_label_new(_("Alias"));
+	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);
+
+	entry_alias = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), entry_alias, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Next row */
+	++top;
+	label = gtk_label_new(_("Remarks"));
+	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);
+
+	entry_remarks = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), entry_remarks, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Button box */
+	vboxb = gtk_vbox_new( FALSE, 4 );
+	gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
+
+	vbuttonbox = gtk_vbutton_box_new();
+	gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
+	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" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
+
+	buttonDown = gtk_button_new_with_label( _( "Move Down" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
+
+	buttonDel = gtk_button_new_with_label( _( "Delete" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
+
+	buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
+
+	buttonAdd = gtk_button_new_with_label( _( "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 */
+	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(buttonClr), "clicked",
+			  G_CALLBACK( edit_person_email_clear ), NULL );
+
+	personeditdlg.clist_email   = clist;
+	personeditdlg.entry_email   = entry_email;
+	personeditdlg.entry_alias   = entry_alias;
+	personeditdlg.entry_remarks = entry_remarks;
+}
+
+void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *hbox;
+	GtkWidget *vboxl;
+	GtkWidget *vboxb;
+	GtkWidget *vbuttonbox;
+	GtkWidget *buttonDel;
+	GtkWidget *buttonMod;
+	GtkWidget *buttonAdd;
+	GtkWidget *buttonClr;
+
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *clist_swin;
+	GtkWidget *clist;
+	GtkWidget *entry_name;
+	GtkWidget *entry_value;
+	gint top;
+
+	gchar *titles[ ATTRIB_N_COLS ];
+	gint i;
+
+	titles[ ATTRIB_COL_NAME  ] = _("Name");
+	titles[ ATTRIB_COL_VALUE ] = _("Value");
+
+	vbox = gtk_vbox_new( FALSE, 8 );
+	gtk_widget_show( vbox );
+	gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( personeditdlg.notebook ),
+		gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
+
+	/* Split into two areas */
+	hbox = gtk_hbox_new( FALSE, 0 );
+	gtk_container_add( GTK_CONTAINER( vbox ), hbox );
+
+	/* Attribute list */
+	vboxl = gtk_vbox_new( FALSE, 4 );
+	gtk_container_add( GTK_CONTAINER( hbox ), vboxl );
+	gtk_container_set_border_width( GTK_CONTAINER(vboxl), 4 );
+
+	/* Address list */
+	clist_swin = gtk_scrolled_window_new( NULL, NULL );
+	gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_ALWAYS);
+
+	clist = gtk_clist_new_with_titles( ATTRIB_N_COLS, titles );
+	gtk_container_add( GTK_CONTAINER(clist_swin), clist );
+	gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
+	gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME );
+	gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
+
+	for( i = 0; i < ATTRIB_N_COLS; i++ )
+		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+
+	/* Data entry area */
+	table = gtk_table_new( 4, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
+	gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
+	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
+
+	/* First row */
+	top = 0;
+	label = gtk_label_new(_("Name"));
+	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);
+
+	entry_name = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Next row */
+	++top;
+	label = gtk_label_new(_("Value"));
+	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);
+
+	entry_value = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), entry_value, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Button box */
+	vboxb = gtk_vbox_new( FALSE, 4 );
+	gtk_box_pack_start(GTK_BOX(hbox), vboxb, FALSE, FALSE, 2);
+
+	vbuttonbox = gtk_vbutton_box_new();
+	gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
+	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" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
+
+	buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
+
+	buttonAdd = gtk_button_new_with_label( _( "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 */
+	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(buttonClr), "clicked",
+			  G_CALLBACK( edit_person_attrib_clear ), NULL );
+
+	personeditdlg.clist_attrib  = clist;
+	personeditdlg.entry_atname  = entry_name;
+	personeditdlg.entry_atvalue = entry_value;
+}
+
+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 );
+}
+
+/*
+* Return list of email items.
+*/
+static GList *edit_person_build_email_list() {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+	GList *listEMail = NULL;
+	ItemEMail *email;
+	gint row = 0;
+	while( (email = gtk_clist_get_row_data( clist, row )) ) {
+		listEMail = g_list_append( listEMail, email );
+		row++;
+	}
+	return listEMail;
+}
+
+/*
+* Return list of attributes.
+*/
+static GList *edit_person_build_attrib_list() {
+	GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+	GList *listAttrib = NULL;
+	UserAttribute *attrib;
+	gint row = 0;
+	while( (attrib = gtk_clist_get_row_data( clist, row )) ) {
+		listAttrib = g_list_append( listAttrib, attrib );
+		row++;
+	}
+	return listAttrib;
+}
+
+/*
+* Edit person.
+* Enter: abf    Address book.
+*        parent Parent folder for person (or NULL if adding to root folder). Argument is
+*               only required for new objects).
+*        person Person to edit, or NULL for a new person object.
+*        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 ) {
+	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));
+
+	/* Clear all fields */
+	personeditdlg.rowIndEMail = -1;
+	personeditdlg.rowIndAttrib = -1;
+	edit_person_status_show( "" );
+	gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+	gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+	gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_name), "" );
+	gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_first), "" );
+	gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_last), "" );
+	gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_nick), "" );
+
+	personeditdlg.editNew = FALSE;
+	if( person ) {
+		if( ADDRITEM_NAME(person) )
+			gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_name), ADDRITEM_NAME(person) );
+		if( person->firstName )
+			gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_first), person->firstName );
+		if( person->lastName )
+			gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_last), person->lastName );
+		if( person->nickName )
+			gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_nick), person->nickName );
+		edit_person_load_email( person );
+		edit_person_load_attrib( person );
+	}
+	else {
+		personeditdlg.editNew = TRUE;
+	}
+
+	/* Select appropriate start page */
+	if( pgMail ) {
+		gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_EMAIL );
+	}
+	else {
+		gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
+	}
+
+	gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_email), 0, 0 );
+	gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_attrib), 0, 0 );
+	edit_person_email_clear( NULL );
+	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 );
+		gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+		gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+		return NULL;
+	}
+
+	cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+	if( person ) {
+		/* Update email/attribute list */
+		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 );
+		}
+	}
+
+	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 );
+	}
+	g_free( cn );
+
+	listEMail = NULL;
+
+	gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+	gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+
+	return person;
+}
+
+/*
+* End of Source.
+*/
+