2005-10-16 [wwp] 1.9.15cvs52
[claws.git] / src / addressbook.c
index fa463aef908b95ea74659c4afde968a1895fe1b4..53ddd30077620997aa2ac4d2940546b86ad5f5b0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
@@ -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>
@@ -44,7 +45,6 @@
 #include <string.h>
 #include <setjmp.h>
 
-#include "intl.h"
 #include "main.h"
 #include "addressbook.h"
 #include "manage_window.h"
@@ -52,8 +52,9 @@
 #include "alertpanel.h"
 #include "inputdialog.h"
 #include "menu.h"
+#include "stock_pixmap.h"
 #include "xml.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "procmime.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "about.h"
 #include "addr_compl.h"
 
+#include "mgutils.h"
 #include "addressitem.h"
+#include "addritem.h"
+#include "addrcache.h"
+#include "addrbook.h"
+#include "addrindex.h"
+#include "addressadd.h"
 #include "vcard.h"
 #include "editvcard.h"
+#include "editgroup.h"
+#include "editaddress.h"
+#include "editbook.h"
+#include "importldif.h"
+#include "importmutt.h"
+#include "importpine.h"
 
 #ifdef USE_JPILOT
 #include "jpilot.h"
 
 #ifdef USE_LDAP
 #include <pthread.h>
-#include "syldap.h"
+#include "ldapserver.h"
 #include "editldap.h"
 
-// Interval to check for LDAP search results
-// #define ADDRESSBOOK_LDAP_TIMER_INTERVAL     100
-#define ADDRESSBOOK_LDAP_BUSYMSG       "Busy"
-
+#define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
 #endif
 
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/group.xpm"
-#include "pixmaps/vcard.xpm"
-#ifdef USE_JPILOT
-#include "pixmaps/jpilot.xpm"
-#include "pixmaps/category.xpm"
-#endif
-#ifdef USE_LDAP
-#include "pixmaps/ldap.xpm"
-#endif
+#include "addrquery.h"
+#include "addrselect.h"
+#include "addrclip.h"
+#include "addrgather.h"
+#include "adbookbase.h"
+#include "exphtmldlg.h"
+#include "expldifdlg.h"
+#include "browseldap.h"
 
-// XML tag names for top level folders
-#define ADDRESS_TAG_COMMON    "common_address"
-#define ADDRESS_TAG_PERSONAL  "personal_address"
-#define ADDRESS_TAG_VCARD     "vcard_list"
-#ifdef USE_JPILOT
-#define ADDRESS_TAG_JPILOT    "jpilot_list"
-#endif
-#ifdef USE_LDAP
-#define ADDRESS_TAG_LDAP      "ldap_list"
-#endif
+typedef enum
+{
+       COL_SOURCES     = 0,
+       N_INDEX_COLS    = 1
+} AddressIndexColumns;
 
 typedef enum
 {
        COL_NAME        = 0,
        COL_ADDRESS     = 1,
-       COL_REMARKS     = 2
-} AddressBookColumnPos;
+       COL_REMARKS     = 2,
+       N_LIST_COLS     = 3
+} AddressListColumns;
 
-#define N_COLS 3
-#define COL_NAME_WIDTH         144
+#define COL_NAME_WIDTH         164
 #define COL_ADDRESS_WIDTH      156
 
 #define COL_FOLDER_WIDTH       170
@@ -127,41 +129,42 @@ static GdkPixmap *folderopenxpm;
 static GdkBitmap *folderopenxpmmask;
 static GdkPixmap *groupxpm;
 static GdkBitmap *groupxpmmask;
+static GdkPixmap *interfacexpm;
+static GdkBitmap *interfacexpmmask;
+static GdkPixmap *bookxpm;
+static GdkBitmap *bookxpmmask;
+static GdkPixmap *addressxpm;
+static GdkBitmap *addressxpmmask;
 static GdkPixmap *vcardxpm;
 static GdkBitmap *vcardxpmmask;
-#ifdef USE_JPILOT
 static GdkPixmap *jpilotxpm;
 static GdkBitmap *jpilotxpmmask;
 static GdkPixmap *categoryxpm;
 static GdkBitmap *categoryxpmmask;
-#endif
-#ifdef USE_LDAP
 static GdkPixmap *ldapxpm;
 static GdkBitmap *ldapxpmmask;
-#endif
+static GdkPixmap *addrsearchxpm;
+static GdkPixmap *addrsearchxpmmask;
+
+/* Message buffer */
+static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
 
-// Pilot library indicator (set at run-time)
-static _have_pilot_library_;
+/* Address list selection */
+static AddrSelectList *_addressSelect_ = NULL;
+static AddressClipboard *_clipBoard_ = NULL;
 
-// LDAP library indicator (set at run-time)
-static _have_ldap_library_;
+/* Address index file and interfaces */
+static AddressIndex *_addressIndex_ = NULL;
+static GList *_addressInterfaceList_ = NULL;
+static GList *_addressIFaceSelection_ = NULL;
+#define ADDRESSBOOK_IFACE_SELECTION "1/y,3/y,4/y,2/n"
 
-// Message buffer
-static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
+static AddressBook_win addrbook;
 
-static AddressBook addrbook;
+static GHashTable *_addressBookTypeHash_ = NULL;
+static GList *_addressBookTypeList_ = NULL;
 
-static struct _AddressEdit
-{
-       GtkWidget *window;
-       GtkWidget *name_entry;
-       GtkWidget *addr_entry;
-       GtkWidget *rem_entry;
-       GtkWidget *ok_btn;
-       GtkWidget *cancel_btn;
-} addredit;
-
-static void addressbook_create                 (gboolean show);
+static void addressbook_create                 (void);
 static gint addressbook_close                  (void);
 static void addressbook_button_set_sensitive   (void);
 
@@ -174,36 +177,48 @@ static void addressbook_to_clicked                (GtkButton      *button,
                                                 gpointer        data);
 static void addressbook_lup_clicked            (GtkButton      *button,
                                                 gpointer       data);
+static void addressbook_close_clicked          (GtkButton      *button,
+                                                gpointer       data);
 
-static void addressbook_tree_selected          (GtkCTree       *ctree,
+static gboolean addressbook_tree_selected      (GtkCTree       *ctree,
+                                                GtkCTreeNode   *node,
+                                                gint            column,
+                                                gpointer        data);
+static void addressbook_select_row_tree                (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 gint            column,
                                                 gpointer        data);
-static void addressbook_list_selected          (GtkCList       *clist,
-                                                gint            row,
+static void addressbook_list_row_selected      (GtkCTree       *clist,
+                                                GtkCTreeNode   *node,
+                                                gint            column,
+                                                gpointer        data);
+static void addressbook_list_row_unselected    (GtkCTree       *clist,
+                                                GtkCTreeNode   *node,
                                                 gint            column,
-                                                GdkEvent       *event,
                                                 gpointer        data);
-static void addressbook_entry_gotfocus         (GtkWidget      *widget);
+static void addressbook_person_expand_node     (GtkCTree       *ctree,
+                                                GList          *node,
+                                                gpointer       *data );
+static void addressbook_person_collapse_node   (GtkCTree       *ctree,
+                                                GList          *node,
+                                                gpointer       *data );
 
 #if 0
 static void addressbook_entry_changed          (GtkWidget      *widget);
 #endif
 
-static void addressbook_list_button_pressed    (GtkWidget      *widget,
+static gboolean addressbook_list_button_pressed        (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-static void addressbook_list_button_released   (GtkWidget      *widget,
+static gboolean addressbook_list_button_released(GtkWidget     *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-static void addressbook_tree_button_pressed    (GtkWidget      *ctree,
+static gboolean addressbook_tree_button_pressed        (GtkWidget      *ctree,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-static void addressbook_tree_button_released   (GtkWidget      *ctree,
+static gboolean addressbook_tree_button_released(GtkWidget     *ctree,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-static void addressbook_popup_close            (GtkMenuShell   *menu_shell,
-                                                gpointer        data);
 
 static void addressbook_new_folder_cb          (gpointer        data,
                                                 guint           action,
@@ -211,29 +226,15 @@ static void addressbook_new_folder_cb             (gpointer        data,
 static void addressbook_new_group_cb           (gpointer        data,
                                                 guint           action,
                                                 GtkWidget      *widget);
-static void addressbook_edit_folder_cb         (gpointer        data,
+static void addressbook_treenode_edit_cb       (gpointer        data,
                                                 guint           action,
                                                 GtkWidget      *widget);
-static void addressbook_delete_folder_cb       (gpointer        data,
+static void addressbook_treenode_delete_cb     (gpointer        data,
                                                 guint           action,
                                                 GtkWidget      *widget);
 
 static void addressbook_change_node_name       (GtkCTreeNode   *node,
                                                 const gchar    *name);
-static void addressbook_edit_group             (GtkCTreeNode   *group_node);
-
-static void addressbook_edit_address_create    (gboolean       *cancelled);
-static void edit_address_ok                    (GtkWidget      *widget,
-                                                gboolean       *cancelled);
-static void edit_address_cancel                        (GtkWidget      *widget,
-                                                gboolean       *cancelled);
-static gint edit_address_delete_event          (GtkWidget      *widget,
-                                                GdkEventAny    *event,
-                                                gboolean       *cancelled);
-static void edit_address_key_pressed           (GtkWidget      *widget,
-                                                GdkEventKey    *event,
-                                                gboolean       *cancelled);
-static AddressItem *addressbook_edit_address   (AddressItem    *item);
 
 static void addressbook_new_address_cb         (gpointer        data,
                                                 guint           action,
@@ -248,158 +249,388 @@ static void addressbook_delete_address_cb       (gpointer        data,
 static void close_cb                           (gpointer        data,
                                                 guint           action,
                                                 GtkWidget      *widget);
+static void addressbook_file_save_cb           (gpointer        data,
+                                                guint           action,
+                                                GtkWidget      *widget);
 
-// VCard edit stuff
-static void addressbook_new_vcard_cb           ( gpointer      data,
-                                                 guint         action,
-                                                 GtkWidget     *widget );
+/* Data source edit stuff */
+static void addressbook_new_book_cb            (gpointer        data,
+                                                guint           action,
+                                                GtkWidget      *widget);
+static void addressbook_new_vcard_cb           (gpointer        data,
+                                                guint           action,
+                                                GtkWidget      *widget);
 
 #ifdef USE_JPILOT
-// JPilot edit stuff
-static void addressbook_new_jpilot_cb          ( gpointer      data,
-                                                 guint         action,
-                                                 GtkWidget     *widget );
+static void addressbook_new_jpilot_cb          (gpointer        data,
+                                                guint           action,
+                                                GtkWidget      *widget);
 #endif
 
 #ifdef USE_LDAP
-// LDAP edit stuff
-static void addressbook_new_ldap_cb            ( gpointer      data,
-                                                 guint         action,
-                                                 GtkWidget     *widget );
+static void addressbook_new_ldap_cb            (gpointer        data,
+                                                guint           action,
+                                                GtkWidget      *widget);
 #endif
 
-static AddressItem *addressbook_parse_address  (const gchar    *str);
-static void addressbook_append_to_compose_entry        (AddressItem    *item,
-                                                ComposeEntryType type);
-
 static void addressbook_set_clist              (AddressObject  *obj);
 
-static void addressbook_read_file              (void);
-static void addressbook_get_tree               (XMLFile        *file,
-                                                GtkCTreeNode   *node,
-                                                const gchar    *folder_tag);
-static void addressbook_add_objs               (XMLFile        *file,
-                                                GtkCTreeNode   *node);
+static void addressbook_load_tree              (void);
+void addressbook_read_file                     (void);
 
 static GtkCTreeNode *addressbook_add_object    (GtkCTreeNode   *node,
                                                 AddressObject  *obj);
-static void addressbook_delete_object          (AddressObject  *obj);
-static AddressObject *addressbook_find_object_by_name
-                                               (GtkCTreeNode   *node,
-                                                const gchar    *name);
+static void addressbook_treenode_remove_item   ( void );
 
-static AddressItem *addressbook_parse_item     (XMLFile        *file);
-static void addressbook_xml_recursive_write    (GtkCTreeNode   *node,
-                                                FILE           *fp);
-static void addressbook_node_write_begin       (GtkCTreeNode   *node,
-                                                FILE           *fp);
-static void addressbook_node_write_end         (GtkCTreeNode   *node,
-                                                FILE           *fp);
-static void addressbook_write_items            (FILE           *fp,
-                                                GList          *items,
-                                                guint           level);
-static void tab_indent_out                     (FILE           *fp,
-                                                guint           level);
-
-static void key_pressed                                (GtkWidget      *widget,
+static AddressDataSource *addressbook_find_datasource
+                                               (GtkCTreeNode   *node );
+
+static AddressBookFile *addressbook_get_book_file(void);
+
+static GtkCTreeNode *addressbook_node_add_folder
+                                               (GtkCTreeNode   *node,
+                                               AddressDataSource *ds,
+                                               ItemFolder      *itemFolder,
+                                               AddressObjectType otype);
+static GtkCTreeNode *addressbook_node_add_group (GtkCTreeNode  *node,
+                                               AddressDataSource *ds,
+                                               ItemGroup       *itemGroup);
+static void addressbook_tree_remove_children   (GtkCTree       *ctree,
+                                               GtkCTreeNode    *parent);
+static void addressbook_move_nodes_up          (GtkCTree       *ctree,
+                                               GtkCTreeNode    *node);
+static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
+                                                  ItemGroup    *group);
+static gboolean addressbook_entry_key_pressed  (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
+static gint addressbook_treenode_compare_func  (GtkCList       *clist,
+                                                gconstpointer   ptr1,
+                                                gconstpointer   ptr2);
 static gint addressbook_list_compare_func      (GtkCList       *clist,
                                                 gconstpointer   ptr1,
                                                 gconstpointer   ptr2);
-static gint addressbook_obj_name_compare       (gconstpointer   a,
-                                                gconstpointer   b);
-
-static AddressVCard *addressbook_parse_vcard   ( XMLFile       *file );
-static void addressbook_write_vcard            ( FILE          *fp,
-                                               AddressVCard    *vcard,
-                                               guint           level );
-static void addressbook_vcard_show_message     ( VCardFile *vcf );
+static void addressbook_folder_load_one_person (GtkCTree *clist, 
+                                                ItemPerson *person,  
+                                                AddressTypeControlItem *atci, 
+                                                AddressTypeControlItem *atciMail);
+static void addressbook_folder_refresh_one_person(GtkCTree *clist, 
+                                                 ItemPerson *person);
+static void addressbook_folder_remove_one_person(GtkCTree *clist, 
+                                                ItemPerson *person);
+static void addressbook_folder_remove_node     (GtkCTree *clist, 
+                                                GtkCTreeNode *node);
+
+/* LUT's and IF stuff */
+static void addressbook_free_treenode          ( gpointer data );
+AddressTypeControlItem *addrbookctl_lookup     (gint            ot);
+AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType  ifType);
+
+void addrbookctl_build_map                     (GtkWidget      *window);
+void addrbookctl_build_iflist                  (void);
+AdapterInterface *addrbookctl_find_interface   (AddressIfType   ifType);
+void addrbookctl_build_ifselect                        (void);
+
+static void addrbookctl_free_interface         (AdapterInterface *adapter);
+static void addrbookctl_free_datasource                (AdapterDSource   *adapter);
+static void addrbookctl_free_folder            (AdapterFolder    *adapter);
+static void addrbookctl_free_group             (AdapterGroup     *adapter);
+
+static void addressbook_list_select_clear      ( void );
+static void addressbook_list_select_add                ( AddrItemObject    *aio,
+                                                 AddressDataSource *ds );
+static void addressbook_list_select_remove     ( AddrItemObject    *aio );
+
+static void addressbook_import_ldif_cb         ( void );
+static void addressbook_import_mutt_cb         ( void );
+static void addressbook_import_pine_cb         ( void );
+static void addressbook_export_html_cb         ( void );
+static void addressbook_export_ldif_cb         ( void );
+static void addressbook_clip_cut_cb            ( void );
+static void addressbook_clip_copy_cb           ( void );
+static void addressbook_clip_paste_cb          ( void );
+static void addressbook_treenode_cut_cb                ( void );
+static void addressbook_treenode_copy_cb       ( void );
+static void addressbook_treenode_paste_cb      ( void );
+
+static void addressbook_mail_to_cb             ( void );
 
-#ifdef USE_JPILOT
-static AddressJPilot *addressbook_parse_jpilot ( XMLFile       *file );
-static void addressbook_write_jpilot           ( FILE          *fp,
-                                               AddressJPilot   *jpilot,
-                                               guint           level );
-static void addressbook_jpilot_show_message    ( JPilotFile *jpf );
-#endif
 #ifdef USE_LDAP
-static AddressLDAP *addressbook_parse_ldap     ( XMLFile       *file );
-static void addressbook_write_ldap             ( FILE          *fp,
-                                               AddressLDAP     *ldapi,
-                                               guint           level );
-static void addressbook_ldap_show_message      ( SyldapServer *server );
+static void addressbook_browse_entry_cb                ( void );
 #endif
+static void addressbook_edit_clicked(GtkButton *button, gpointer data);
+
+static void addressbook_start_drag(GtkWidget *widget, gint button, 
+                                  GdkEvent *event,
+                                  void *data);
+static void addressbook_drag_data_get(GtkWidget        *widget,
+                                    GdkDragContext   *drag_context,
+                                    GtkSelectionData *selection_data,
+                                    guint             info,
+                                    guint             time,
+                                    void             *data);
+static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
+                                         GdkDragContext *context,
+                                         gint            x,
+                                         gint            y,
+                                         guint           time,
+                                         void           *data);
+static void addressbook_drag_leave_cb(GtkWidget      *widget,
+                                    GdkDragContext *context,
+                                    guint           time,
+                                    void           *data);
+static void addressbook_drag_received_cb(GtkWidget        *widget,
+                                       GdkDragContext   *drag_context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *data,
+                                       guint             info,
+                                       guint             time,
+                                       void             *pdata);
+static void addressbook_list_menu_setup( void );
+
+static GtkTargetEntry addressbook_drag_types[] =
+{
+       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
+
+static GtkTargetList *addressbook_target_list = NULL;
+
 
 static GtkItemFactoryEntry addressbook_entries[] =
 {
-       {N_("/_File"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_File/New _Address"),     "<alt>N", addressbook_new_address_cb, 0, NULL},
-       {N_("/_File/New _Group"),       "<alt>G", addressbook_new_group_cb,   0, NULL},
-       {N_("/_File/New _Folder"),      "<alt>R", addressbook_new_folder_cb,  0, NULL},
-       {N_("/_File/New _V-Card"),      "<alt>D", addressbook_new_vcard_cb,  0, NULL},
+       {N_("/_Book"),                  NULL,           NULL, 0, "<Branch>"},
+       {N_("/_Book/New _Book"),        "<control>B",   addressbook_new_book_cb,        0, NULL},
+       {N_("/_Book/New _Folder"),      "<control>R",   addressbook_new_folder_cb,      0, NULL},
+       {N_("/_Book/New _vCard"),       "<control><shift>D",    addressbook_new_vcard_cb,       0, NULL},
 #ifdef USE_JPILOT
-       {N_("/_File/New _J-Pilot"),     "<alt>J", addressbook_new_jpilot_cb,  0, NULL},
+       {N_("/_Book/New _JPilot"),      "<control>J",   addressbook_new_jpilot_cb,      0, NULL},
 #endif
 #ifdef USE_LDAP
-       {N_("/_File/New _Server"),      "<alt>S", addressbook_new_ldap_cb,  0, NULL},
+       {N_("/_Book/New _Server"),      "<control><shift>S",    addressbook_new_ldap_cb,        0, NULL},
 #endif
-       {N_("/_File/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_File/_Edit"),            "<alt>Return", addressbook_edit_address_cb, 0, NULL},
-       {N_("/_File/_Delete"),          NULL, addressbook_delete_address_cb, 0, NULL},
-       {N_("/_File/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_File/_Close"),           "<alt>W", close_cb, 0, NULL},
-       {N_("/_Help"),                  NULL, NULL, 0, "<LastBranch>"},
-       {N_("/_Help/_About"),           NULL, about_show, 0, NULL}
+       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Book/_Edit book"),       NULL,           addressbook_treenode_edit_cb,   0, NULL},
+       {N_("/_Book/_Delete book"),     NULL,           addressbook_treenode_delete_cb, 0, NULL},
+       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Book/_Save"),            "<control>S",   addressbook_file_save_cb,       0, NULL},
+       {N_("/_Book/_Close"),           "<control>W",   close_cb,                       0, NULL},
+       {N_("/_Address"),                       NULL,           NULL, 0, "<Branch>"},
+       {N_("/_Address/C_ut"),          "<control>X",   addressbook_clip_cut_cb,        0, NULL},
+       {N_("/_Address/_Copy"),         "<control>C",   addressbook_clip_copy_cb,       0, NULL},
+       {N_("/_Address/_Paste"),        "<control>V",   addressbook_clip_paste_cb,      0, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Address/_Edit"),         "<control>Return",addressbook_edit_address_cb,    0, NULL},
+       {N_("/_Address/_Delete"),       "<control>D",   addressbook_delete_address_cb,  0, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Address/New _Address"),  "<control>N",   addressbook_new_address_cb,     0, NULL},
+       {N_("/_Address/New _Group"),    "<control>G",   addressbook_new_group_cb,       0, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Address/_Mail To"),      NULL,           addressbook_mail_to_cb,         0, NULL},
+       {N_("/_Tools"),                 NULL,           NULL, 0, "<Branch>"},
+       {N_("/_Tools/Import _LDIF file..."), NULL,      addressbook_import_ldif_cb,     0, NULL},
+       {N_("/_Tools/Import M_utt file..."), NULL,      addressbook_import_mutt_cb,     0, NULL},
+       {N_("/_Tools/Import _Pine file..."), NULL,      addressbook_import_pine_cb,     0, NULL},
+       {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Tools/Export _HTML..."), NULL,           addressbook_export_html_cb,     0, NULL},
+       {N_("/_Tools/Export LDI_F..."), NULL,           addressbook_export_ldif_cb,     0, NULL},
+       {N_("/_Help"),                  NULL,           NULL, 0, "<Branch>"},
+       {N_("/_Help/_About"),           NULL,           about_show, 0, NULL}
 };
 
 static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 {
-       {N_("/New _Address"),   NULL, addressbook_new_address_cb, 0, NULL},
-       {N_("/New _Group"),     NULL, addressbook_new_group_cb,   0, NULL},
-       {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,  0, NULL},
-       {N_("/New _V-Card"),    NULL, addressbook_new_vcard_cb,   0, NULL},
-#ifdef USE_JPILOT
-       {N_("/New _J-Pilot"),   NULL, addressbook_new_jpilot_cb,  0, NULL},
-#endif
-#ifdef USE_LDAP
-       {N_("/New _Server"),    NULL, addressbook_new_ldap_cb,  0, NULL},
-#endif
+       {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL},
+       {N_("/_Delete"),        NULL, addressbook_treenode_delete_cb, 0, NULL},
        {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit"),          NULL, addressbook_edit_folder_cb,   0, NULL},
-       {N_("/_Delete"),        NULL, addressbook_delete_folder_cb, 0, NULL}
+       {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,      0, NULL},
+       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/C_ut"),           NULL, addressbook_treenode_cut_cb,    0, NULL},
+       {N_("/_Copy"),          NULL, addressbook_treenode_copy_cb,   0, NULL},
+       {N_("/_Paste"),         NULL, addressbook_treenode_paste_cb,  0, NULL}
 };
 
 static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 {
-       {N_("/New _Address"),   NULL, addressbook_new_address_cb,  0, NULL},
-       {N_("/New _Group"),     NULL, addressbook_new_group_cb,    0, NULL},
-       {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,   0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit"),          NULL, addressbook_edit_address_cb,   0, NULL},
-       {N_("/_Delete"),        NULL, addressbook_delete_address_cb, 0, NULL}
+       {N_("/_Delete"),        NULL, addressbook_delete_address_cb, 0, NULL},
+       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/New _Address"),   NULL, addressbook_new_address_cb,    0, NULL},
+       {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
+       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/C_ut"),           NULL, addressbook_clip_cut_cb,       0, NULL},
+       {N_("/_Copy"),          NULL, addressbook_clip_copy_cb,      0, NULL},
+       {N_("/_Paste"),         NULL, addressbook_clip_paste_cb,     0, NULL},
+       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+/*     {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
+       {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL},
+#ifdef USE_LDAP
+       {N_("/_Browse Entry"),  NULL, addressbook_browse_entry_cb,       0, NULL},
+#endif 
+};
+
+/**
+ * Structure of error message table.
+ */
+typedef struct _ErrMsgTableEntry ErrMsgTableEntry;
+struct _ErrMsgTableEntry {
+       gint    code;
+       gchar   *description;
+};
+
+static gchar *_errMsgUnknown_ = N_( "Unknown" );
+
+/**
+ * Lookup table of error messages for general errors. Note that a NULL
+ * description signifies the end of the table.
+ */
+static ErrMsgTableEntry _lutErrorsGeneral_[] = {
+       { MGU_SUCCESS,          N_("Success") },
+       { MGU_BAD_ARGS,         N_("Bad arguments") },
+       { MGU_NO_FILE,          N_("File not specified") },
+       { MGU_OPEN_FILE,        N_("Error opening file") },
+       { MGU_ERROR_READ,       N_("Error reading file") },
+       { MGU_EOF,              N_("End of file encountered") },
+       { MGU_OO_MEMORY,        N_("Error allocating memory") },
+       { MGU_BAD_FORMAT,       N_("Bad file format") },
+       { MGU_ERROR_WRITE,      N_("Error writing to file") },
+       { MGU_OPEN_DIRECTORY,   N_("Error opening directory") },
+       { MGU_NO_PATH,          N_("No path specified") },
+       { 0,                    NULL }
+};
+
+#ifdef USE_LDAP
+/**
+ * Lookup table of error messages for LDAP errors.
+ */
+static ErrMsgTableEntry _lutErrorsLDAP_[] = {
+       { LDAPRC_SUCCESS,       N_("Success") },
+       { LDAPRC_CONNECT,       N_("Error connecting to LDAP server") },
+       { LDAPRC_INIT,          N_("Error initializing LDAP") },
+       { LDAPRC_BIND,          N_("Error binding to LDAP server") },
+       { LDAPRC_SEARCH,        N_("Error searching LDAP database") },
+       { LDAPRC_TIMEOUT,       N_("Timeout performing LDAP operation") },
+       { LDAPRC_CRITERIA,      N_("Error in LDAP search criteria") },
+       { LDAPRC_NOENTRIES,     N_("No LDAP entries found for search criteria") },
+       { LDAPRC_STOP_FLAG,     N_("LDAP search terminated on request") },
+       { LDAPRC_TLS,           N_("Error starting TLS connection") },
+       { 0,                    NULL }
 };
+#endif
+
+/**
+ * Lookup message for specified error code.
+ * \param lut  Lookup table.
+ * \param code Code to lookup.
+ * \return Description associated to code.
+ */
+static gchar *addressbook_err2string( ErrMsgTableEntry lut[], gint code ) {
+        gchar *desc = NULL;
+        ErrMsgTableEntry entry;
+        gint i;
+
+        for( i = 0; ; i++ ) {
+                entry = lut[ i ];
+                if( entry.description == NULL ) break;
+                if( entry.code == code ) {
+                        desc = entry.description;
+                        break;
+                }
+        }
+        if( ! desc ) {
+               desc = _errMsgUnknown_;
+        }
+        return desc;
+}
+
+static gboolean lastCanLookup = FALSE;
+
+void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
+{
+       if (add_and_delete) {
+               gtk_widget_show(addrbook.edit_btn);
+               gtk_widget_show(addrbook.del_btn);
+               gtk_widget_show(addrbook.reg_btn);
+       } else {
+               gtk_widget_hide(addrbook.edit_btn);
+               gtk_widget_hide(addrbook.del_btn);
+               gtk_widget_hide(addrbook.reg_btn);
+       }
+       
+       if (lookup) {
+               gtk_widget_show(addrbook.lup_btn);
+               gtk_widget_show(addrbook.entry);
+               gtk_widget_show(addrbook.label);
+       } else {
+               gtk_widget_hide(addrbook.lup_btn);
+               gtk_widget_hide(addrbook.entry);
+               gtk_widget_hide(addrbook.label);
+       }
+
+       lastCanLookup = lookup;
+
+       if (mail_ops) {
+               gtk_widget_show(addrbook.to_btn);
+               gtk_widget_show(addrbook.cc_btn);
+               gtk_widget_show(addrbook.bcc_btn);
+       } else {
+               gtk_widget_hide(addrbook.to_btn);
+               gtk_widget_hide(addrbook.cc_btn);
+               gtk_widget_hide(addrbook.bcc_btn);
+       }
+}
 
 void addressbook_open(Compose *target)
 {
+       /* Initialize all static members */
+       if( _clipBoard_ == NULL ) {
+               _clipBoard_ = addrclip_create();
+       }
+       if( _addressIndex_ != NULL ) {
+               addrclip_set_index( _clipBoard_, _addressIndex_ );
+       }
+       if( _addressSelect_ == NULL ) {
+               _addressSelect_ = addrselect_list_create();
+       }
        if (!addrbook.window) {
-               addressbook_create(TRUE);
                addressbook_read_file();
-               addrbook.open_folder = TRUE;
-               gtk_ctree_select(GTK_CTREE(addrbook.ctree),
+               addressbook_create();
+               addressbook_load_tree();
+               gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                 GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
-       } else
+       }
+       else {
                gtk_widget_hide(addrbook.window);
+       }
 
-       gtk_widget_show(addrbook.window);
-
+       gtk_widget_show_all(addrbook.window);
+       addressbook_show_buttons(target == NULL, lastCanLookup, target != NULL);
        addressbook_set_target_compose(target);
 }
 
+/**
+ * Destroy addressbook.
+ */
+void addressbook_destroy( void ) {
+       /* Free up address stuff */
+       if( _addressSelect_ != NULL ) {
+               addrselect_list_free( _addressSelect_ );
+       }
+       if( _clipBoard_ != NULL ) {
+               addrclip_free( _clipBoard_ );
+       }
+       if( _addressIndex_ != NULL ) {
+               addrindex_free_index( _addressIndex_ );
+               addrindex_teardown();
+       }
+       _addressSelect_ = NULL;
+       _clipBoard_ = NULL;
+       _addressIndex_ = NULL;
+}
+
 void addressbook_set_target_compose(Compose *target)
 {
        addrbook.target_compose = target;
-
        addressbook_button_set_sensitive();
 }
 
@@ -408,7 +639,57 @@ Compose *addressbook_get_target_compose(void)
        return addrbook.target_compose;
 }
 
-static void addressbook_create(gboolean show)
+/**
+ * Refresh addressbook and save to file(s).
+ */
+void addressbook_refresh( void )
+{
+       if (addrbook.window) {
+               if (addrbook.treeSelected) {
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
+                                        addrbook.treeSelected);
+               }
+       }
+       addressbook_export_to_file();
+}
+
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Escape)
+               addressbook_close();
+       else if (event && event->keyval == GDK_Delete)
+               addressbook_del_clicked(NULL, NULL);
+       return FALSE;
+}
+
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void addressbook_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.addressbookwin_width = allocation->width;
+       prefs_common.addressbookwin_height = allocation->height;
+}
+
+/*
+* Create the address book widgets. The address book contains two CTree widgets: the
+* address index tree on the left and the address list on the right.
+*
+* The address index tree displays a hierarchy of interfaces and groups. Each node in
+* this tree is linked to an address Adapter. Adapters have been created for interfaces,
+* data sources and folder objects.
+*
+* The address list displays group, person and email objects. These items are linked
+* directly to ItemGroup, ItemPerson and ItemEMail objects inside the address book data
+* sources.
+*
+* In the tradition of MVC architecture, the data stores have been separated from the
+* GUI components. The addrindex.c file provides the interface to all data stores.
+*/
+static void addressbook_create(void)
 {
        GtkWidget *window;
        GtkWidget *vbox;
@@ -424,51 +705,56 @@ static void addressbook_create(gboolean show)
        GtkWidget *label;
        GtkWidget *entry;
        GtkWidget *statusbar;
-       GtkWidget *hmbox;
        GtkWidget *hbbox;
        GtkWidget *hsbox;
        GtkWidget *del_btn;
+       GtkWidget *edit_btn;
        GtkWidget *reg_btn;
        GtkWidget *lup_btn;
        GtkWidget *to_btn;
        GtkWidget *cc_btn;
        GtkWidget *bcc_btn;
+       GtkWidget *close_btn;
        GtkWidget *tree_popup;
        GtkWidget *list_popup;
        GtkItemFactory *tree_factory;
        GtkItemFactory *list_factory;
        GtkItemFactory *menu_factory;
        gint n_entries;
+       GList *nodeIf;
 
-       gchar *titles[N_COLS] = {_("Name"), _("E-Mail address"), _("Remarks")};
+       gchar *index_titles[N_INDEX_COLS];
+       gchar *list_titles[N_LIST_COLS];
        gchar *text;
        gint i;
 
+       static GdkGeometry geometry;
+
        debug_print("Creating addressbook window...\n");
 
-       // Global flag if we have library installed (at run-time)
-       _have_pilot_library_ = FALSE;
-       _have_ldap_library_ = FALSE;
+       index_titles[COL_SOURCES] = _("Sources");
+       list_titles[COL_NAME]    = _("Name");
+       list_titles[COL_ADDRESS] = _("E-Mail address");
+       list_titles[COL_REMARKS] = _("Remarks");
 
+       /* Address book window */
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
-       gtk_widget_set_usize(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
-       //gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH);
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_realize(window);
 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(addressbook_close), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(key_pressed), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(addressbook_close), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(addressbook_size_allocate_cb), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(key_pressed), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
+       /* Menu bar */
        n_entries = sizeof(addressbook_entries) /
                sizeof(addressbook_entries[0]);
        menubar = menubar_create(window, addressbook_entries, n_entries,
@@ -476,17 +762,18 @@ static void addressbook_create(gboolean show)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
        menu_factory = gtk_item_factory_from_widget(menubar);
 
-       vbox2 = gtk_vbox_new(FALSE, 4);
+       vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
        gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
        gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
 
        ctree_swin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-       gtk_widget_set_usize(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
+                                      GTK_POLICY_AUTOMATIC);
+       gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
 
-       ctree = gtk_ctree_new(1, 0);
+       /* Address index */
+       ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
        gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_clist_set_column_width(GTK_CLIST(ctree), 0, COL_FOLDER_WIDTH);
@@ -495,28 +782,48 @@ static void addressbook_create(gboolean show)
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
        gtk_clist_set_compare_func(GTK_CLIST(ctree),
-                                  addressbook_list_compare_func);
-
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(addressbook_tree_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(addressbook_tree_button_pressed),
-                          NULL);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
-                          GTK_SIGNAL_FUNC(addressbook_tree_button_released),
-                          NULL);
+                                  addressbook_treenode_compare_func);
+
+       g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+                        G_CALLBACK(addressbook_tree_button_pressed),
+                        NULL);
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
+                        G_CALLBACK(addressbook_tree_button_released),
+                        NULL);
+       /* TEMPORARY */
+       g_signal_connect(G_OBJECT(ctree), "select_row",
+                        G_CALLBACK(addressbook_select_row_tree), NULL);
+
+       gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
+                         addressbook_drag_types, 1,
+                         GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
+       g_signal_connect(G_OBJECT(ctree), "drag_motion",
+                        G_CALLBACK(addressbook_drag_motion_cb),
+                        ctree);
+       g_signal_connect(G_OBJECT(ctree), "drag_leave",
+                        G_CALLBACK(addressbook_drag_leave_cb),
+                        ctree);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_received",
+                        G_CALLBACK(addressbook_drag_received_cb),
+                        ctree);
 
        clist_vbox = gtk_vbox_new(FALSE, 4);
 
        clist_swin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC);
        gtk_box_pack_start(GTK_BOX(clist_vbox), clist_swin, TRUE, TRUE, 0);
 
-       clist = gtk_clist_new_with_titles(N_COLS, titles);
+       /* Address list */
+       clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
        gtk_container_add(GTK_CONTAINER(clist_swin), clist);
        gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
+       gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
+       gtk_ctree_set_expander_style(GTK_CTREE(clist), GTK_CTREE_EXPANDER_SQUARE);
+       gtk_ctree_set_indent(GTK_CTREE(clist), CTREE_INDENT);
        gtk_clist_set_column_width(GTK_CLIST(clist), COL_NAME,
                                   COL_NAME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
@@ -524,35 +831,45 @@ static void addressbook_create(gboolean show)
        gtk_clist_set_compare_func(GTK_CLIST(clist),
                                   addressbook_list_compare_func);
 
-       for (i = 0; i < N_COLS; i++)
+       for (i = 0; i < N_LIST_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
                                       GTK_CAN_FOCUS);
 
-       gtk_signal_connect(GTK_OBJECT(clist), "select_row",
-                          GTK_SIGNAL_FUNC(addressbook_list_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(clist), "button_press_event",
-                          GTK_SIGNAL_FUNC(addressbook_list_button_pressed),
-                          NULL);
-       gtk_signal_connect(GTK_OBJECT(clist), "button_release_event",
-                          GTK_SIGNAL_FUNC(addressbook_list_button_released),
-                          NULL);
-
+       g_signal_connect(G_OBJECT(clist), "tree_select_row",
+                        G_CALLBACK(addressbook_list_row_selected), NULL);
+       g_signal_connect(G_OBJECT(clist), "tree_unselect_row",
+                        G_CALLBACK(addressbook_list_row_unselected), NULL);
+       g_signal_connect(G_OBJECT(clist), "button_press_event",
+                        G_CALLBACK(addressbook_list_button_pressed),
+                        NULL);
+       g_signal_connect(G_OBJECT(clist), "button_release_event",
+                        G_CALLBACK(addressbook_list_button_released),
+                        NULL);
+       g_signal_connect(G_OBJECT(clist), "tree_expand",
+                        G_CALLBACK(addressbook_person_expand_node), NULL );
+       g_signal_connect(G_OBJECT(clist), "tree_collapse",
+                        G_CALLBACK(addressbook_person_collapse_node), NULL );
+       g_signal_connect(G_OBJECT(clist), "start_drag",
+                        G_CALLBACK(addressbook_start_drag), NULL);
+       g_signal_connect(G_OBJECT(clist), "drag_data_get",
+                        G_CALLBACK(addressbook_drag_data_get), NULL);  
        hbox = gtk_hbox_new(FALSE, 4);
        gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
 
-       label = gtk_label_new(_("Name:"));
+       label = gtk_label_new(_("Lookup name:"));
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        address_completion_register_entry(GTK_ENTRY(entry));
-       gtk_signal_connect(GTK_OBJECT(entry), "focus_in_event",
-                          GTK_SIGNAL_FUNC(addressbook_entry_gotfocus), NULL);
 
+       g_signal_connect(G_OBJECT(entry), "key_press_event",
+                        G_CALLBACK(addressbook_entry_key_pressed),
+                        NULL);
 #if 0
-       gtk_signal_connect(GTK_OBJECT(entry), "changed",
-                          GTK_SIGNAL_FUNC(addressbook_entry_changed), NULL);
+       g_signal_connect(G_OBJECT(entry), "changed",
+                        G_CALLBACK(addressbook_entry_changed), NULL);
 #endif
 
        paned = gtk_hpaned_new();
@@ -560,34 +877,46 @@ static void addressbook_create(gboolean show)
        gtk_paned_add1(GTK_PANED(paned), ctree_swin);
        gtk_paned_add2(GTK_PANED(paned), clist_vbox);
 
-       // Status bar
+       /* Status bar */
        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
+       /* Button panel */
        hbbox = gtk_hbutton_box_new();
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+       gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
-       del_btn = gtk_button_new_with_label(_("Delete"));
+#if GTK_CHECK_VERSION(2, 6, 0)
+       edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+#else
+       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
+       GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
-       reg_btn = gtk_button_new_with_label(_("Add"));
+       reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
        GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
-       lup_btn = gtk_button_new_with_label(_("Lookup"));
+
+
+       lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
        GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
-       gtk_box_pack_start(GTK_BOX(hbbox), lup_btn, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_del_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_reg_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(lup_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_lup_clicked), NULL);
+       g_signal_connect(G_OBJECT(edit_btn), "clicked",
+                        G_CALLBACK(addressbook_edit_clicked), NULL);
+       g_signal_connect(G_OBJECT(del_btn), "clicked",
+                        G_CALLBACK(addressbook_del_clicked), NULL);
+       g_signal_connect(G_OBJECT(reg_btn), "clicked",
+                        G_CALLBACK(addressbook_reg_clicked), NULL);
+       g_signal_connect(G_OBJECT(lup_btn), "clicked",
+                        G_CALLBACK(addressbook_lup_clicked), NULL);
 
        to_btn = gtk_button_new_with_label
                (prefs_common.trans_hdr ? _("To:") : "To:");
@@ -602,95 +931,61 @@ static void addressbook_create(gboolean show)
        GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
 
-       gtk_signal_connect(GTK_OBJECT(to_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_to_clicked),
-                          GINT_TO_POINTER(COMPOSE_TO));
-       gtk_signal_connect(GTK_OBJECT(cc_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_to_clicked),
-                          GINT_TO_POINTER(COMPOSE_CC));
-       gtk_signal_connect(GTK_OBJECT(bcc_btn), "clicked",
-                          GTK_SIGNAL_FUNC(addressbook_to_clicked),
-                          GINT_TO_POINTER(COMPOSE_BCC));
-
-       PIXMAP_CREATE(window, folderxpm, folderxpmmask, DIRECTORY_CLOSE_XPM);
-       PIXMAP_CREATE(window, folderopenxpm, folderopenxpmmask,
-                     DIRECTORY_OPEN_XPM);
-       PIXMAP_CREATE(window, groupxpm, groupxpmmask, group_xpm);
-       PIXMAP_CREATE(window, vcardxpm, vcardxpmmask, vcard_xpm);
-#ifdef USE_JPILOT
-       PIXMAP_CREATE(window, jpilotxpm, jpilotxpmmask, jpilot_xpm);
-       PIXMAP_CREATE(window, categoryxpm, categoryxpmmask, category_xpm);
-#endif
-#ifdef USE_LDAP
-       PIXMAP_CREATE(window, ldapxpm, ldapxpmmask, ldap_xpm);
-#endif
-
-       text = _("Common address");
-       addrbook.common =
-               gtk_ctree_insert_node(GTK_CTREE(ctree),
-                                     NULL, NULL, &text, FOLDER_SPACING,
-                                     folderxpm, folderxpmmask,
-                                     folderopenxpm, folderopenxpmmask,
-                                     FALSE, FALSE);
-       text = _("Personal address");
-       addrbook.personal =
-               gtk_ctree_insert_node(GTK_CTREE(ctree),
-                                     NULL, NULL, &text, FOLDER_SPACING,
-                                     folderxpm, folderxpmmask,
-                                     folderopenxpm, folderopenxpmmask,
-                                     FALSE, FALSE);
-
-       text = _("V-Card");
-       addrbook.vcard =
-               gtk_ctree_insert_node(GTK_CTREE(ctree),
-                                     NULL, NULL, &text, FOLDER_SPACING,
-                                     folderxpm, folderxpmmask,
-                                     folderopenxpm, folderopenxpmmask,
-                                     FALSE, FALSE);
-
-#ifdef USE_JPILOT
-       text = _("J-Pllot");
-       addrbook.jpilot =
-               gtk_ctree_insert_node(GTK_CTREE(ctree),
-                                     NULL, NULL, &text, FOLDER_SPACING,
-                                     folderxpm, folderxpmmask,
-                                     folderopenxpm, folderopenxpmmask,
-                                     FALSE, FALSE);
-       if( jpilot_test_pilot_lib() ) {
-               _have_pilot_library_ = TRUE;
-               menu_set_sensitive( menu_factory, "/File/New J-Pilot", TRUE );
-       }
-       else {
-               menu_set_sensitive( menu_factory, "/File/New J-Pilot", FALSE );
-       }
-#endif
-
-#ifdef USE_LDAP
-       text = _("Directory");
-       addrbook.ldap =
-               gtk_ctree_insert_node(GTK_CTREE(ctree),
-                                     NULL, NULL, &text, FOLDER_SPACING,
-                                     folderxpm, folderxpmmask,
-                                     folderopenxpm, folderopenxpmmask,
-                                     FALSE, FALSE);
-       if( syldap_test_ldap_lib() ) {
-               _have_ldap_library_ = TRUE;
-               menu_set_sensitive( menu_factory, "/File/New Server", TRUE );
-       }
-       else {
-               menu_set_sensitive( menu_factory, "/File/New Server", FALSE );
+       close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
+
+       g_signal_connect(G_OBJECT(to_btn), "clicked",
+                        G_CALLBACK(addressbook_to_clicked),
+                        GINT_TO_POINTER(COMPOSE_TO));
+       g_signal_connect(G_OBJECT(cc_btn), "clicked",
+                        G_CALLBACK(addressbook_to_clicked),
+                        GINT_TO_POINTER(COMPOSE_CC));
+       g_signal_connect(G_OBJECT(bcc_btn), "clicked",
+                        G_CALLBACK(addressbook_to_clicked),
+                        GINT_TO_POINTER(COMPOSE_BCC));
+       g_signal_connect(G_OBJECT(close_btn), "clicked",
+                        G_CALLBACK(addressbook_close_clicked), NULL);
+
+       /* Build icons for interface */
+       stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
+                         &interfacexpm, &interfacexpmmask );
+
+       /* Build control tables */
+       addrbookctl_build_map(window);
+       addrbookctl_build_iflist();
+       addrbookctl_build_ifselect();
+
+       /* Add each interface into the tree as a root level folder */
+       nodeIf = _addressInterfaceList_;
+       while( nodeIf ) {
+               AdapterInterface *adapter = nodeIf->data;
+               AddressInterface *iface = adapter->interface;
+               nodeIf = g_list_next(nodeIf);
+
+               if(iface->useInterface) {
+                       AddressTypeControlItem *atci = adapter->atci;
+                       text = atci->displayName;
+                       adapter->treeNode =
+                               gtk_ctree_insert_node( GTK_CTREE(ctree),
+                                       NULL, NULL, &text, FOLDER_SPACING,
+                                       interfacexpm, interfacexpmmask,
+                                       interfacexpm, interfacexpmmask,
+                                       FALSE, FALSE );
+                       menu_set_sensitive( menu_factory, atci->menuCommand, adapter->haveLibrary );
+                       gtk_ctree_node_set_row_data_full(
+                               GTK_CTREE(ctree), adapter->treeNode, adapter,
+                               addressbook_free_treenode );
+               }
        }
-#endif
 
-       /* popup menu */
+       /* Popup menu */
        n_entries = sizeof(addressbook_tree_popup_entries) /
                sizeof(addressbook_tree_popup_entries[0]);
        tree_popup = menu_create_items(addressbook_tree_popup_entries,
                                       n_entries,
                                       "<AddressBookTree>", &tree_factory,
                                       NULL);
-       gtk_signal_connect(GTK_OBJECT(tree_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(addressbook_popup_close), NULL);
        n_entries = sizeof(addressbook_list_popup_entries) /
                sizeof(addressbook_list_popup_entries[0]);
        list_popup = menu_create_items(addressbook_list_popup_entries,
@@ -701,11 +996,16 @@ static void addressbook_create(gboolean show)
        addrbook.window  = window;
        addrbook.menubar = menubar;
        addrbook.ctree   = ctree;
+       addrbook.ctree_swin
+                        = ctree_swin;
        addrbook.clist   = clist;
+       addrbook.label   = label;
        addrbook.entry   = entry;
        addrbook.statusbar = statusbar;
-       addrbook.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Addressbook Window" );
+       addrbook.status_cid = gtk_statusbar_get_context_id(
+                       GTK_STATUSBAR(statusbar), "Addressbook Window" );
 
+       addrbook.edit_btn = edit_btn;
        addrbook.del_btn = del_btn;
        addrbook.reg_btn = reg_btn;
        addrbook.lup_btn = lup_btn;
@@ -719,30 +1019,85 @@ static void addressbook_create(gboolean show)
        addrbook.list_factory = list_factory;
        addrbook.menu_factory = menu_factory;
 
+       addrbook.listSelected = NULL;
        address_completion_start(window);
 
-       if (show) 
-               gtk_widget_show_all(window);
+       if (!geometry.min_height) {
+               geometry.min_width = ADDRESSBOOK_WIDTH;
+               geometry.min_height = ADDRESSBOOK_HEIGHT;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
+                                   prefs_common.addressbookwin_height);
+
+       gtk_widget_show_all(window);
 }
 
-static gint addressbook_close(void)
-{
+/**
+ * Close address book window and save to file(s).
+ */
+static gint addressbook_close( void ) {
        gtk_widget_hide(addrbook.window);
        addressbook_export_to_file();
-       /* tell addr_compl that there's a new addressbook file */
-       invalidate_address_completion();
        return TRUE;
 }
 
+/**
+ * Display message in status line.
+ * \param msg Message to display.
+ */
 static void addressbook_status_show( gchar *msg ) {
        if( addrbook.statusbar != NULL ) {
-               gtk_statusbar_pop( GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid );
+               gtk_statusbar_pop(
+                       GTK_STATUSBAR(addrbook.statusbar),
+                       addrbook.status_cid );
                if( msg ) {
-                       gtk_statusbar_push( GTK_STATUSBAR(addrbook.statusbar), addrbook.status_cid, msg );
+                       gtk_statusbar_push(
+                               GTK_STATUSBAR(addrbook.statusbar),
+                               addrbook.status_cid, msg );
                }
        }
 }
 
+static void addressbook_ds_status_message( AddressDataSource *ds, gchar *msg ) {
+       *addressbook_msgbuf = '\0';
+       if( ds ) {
+               gchar *name;
+
+               name = addrindex_ds_get_name( ds );
+               g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
+                           "%s: %s", name, msg );
+       }
+       else {
+               g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
+                           "%s", msg );
+       }
+       addressbook_status_show( addressbook_msgbuf );
+}
+
+static void addressbook_ds_show_message( AddressDataSource *ds ) {
+       gint retVal;
+       gchar *name;
+       gchar *desc;
+       *addressbook_msgbuf = '\0';
+       if( ds ) {
+               name = addrindex_ds_get_name( ds );
+               retVal = addrindex_ds_get_status_code( ds );
+               if( retVal == MGU_SUCCESS ) {
+                       g_snprintf( addressbook_msgbuf,
+                                   sizeof(addressbook_msgbuf), "%s", name );
+               }
+               else {
+                       desc = addressbook_err2string( _lutErrorsGeneral_, retVal );
+                       g_snprintf( addressbook_msgbuf, 
+                           sizeof(addressbook_msgbuf), "%s: %s", name, desc );
+               }
+       }
+       addressbook_status_show( addressbook_msgbuf );
+}
+
 static void addressbook_button_set_sensitive(void)
 {
        gboolean to_sens  = FALSE;
@@ -754,7 +1109,9 @@ static void addressbook_button_set_sensitive(void)
        if (addrbook.target_compose) {
                to_sens = TRUE;
                cc_sens = TRUE;
+#ifndef CLAWS          
                if (addrbook.target_compose->use_bcc)
+#endif                 
                        bcc_sens = TRUE;
        }
 
@@ -763,2942 +1120,3747 @@ static void addressbook_button_set_sensitive(void)
        gtk_widget_set_sensitive(addrbook.bcc_btn, bcc_sens);
 }
 
+static void addressbook_edit_clicked(GtkButton *button, gpointer data)
+{
+       addressbook_edit_address_cb(NULL, 0, NULL);
+}
+
+/*
+* Delete one or more objects from address list.
+*/
 static void addressbook_del_clicked(GtkButton *button, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
+       GtkCTree *clist = GTK_CTREE(addrbook.clist);
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *pobj, *obj;
-       GList *cur, *next;
-       gint row;
-       gboolean remFlag;
+       AddressObject *pobj;
+       AdapterDSource *ads = NULL;
+       GtkCTreeNode *nodeList;
+       gboolean procFlag;
+       AlertValue aval;
+       AddressBookFile *abf = NULL;
+       AddressDataSource *ds = NULL;
+       AddressInterface *iface;
+       AddrItemObject *aio;
+       AddrSelectItem *item;
+       GList *list, *node;
+       gboolean refreshList = FALSE;
+       
+       pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
+       g_return_if_fail(pobj != NULL);
 
-       if (!clist->selection) {
-               addressbook_delete_folder_cb(NULL, 0, NULL);
-               return;
-       }
+       /* Test whether anything selected for deletion */
+       nodeList = addrbook.listSelected;
 
-       pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened);
-       g_return_if_fail(pobj != NULL);
+       aio = gtk_ctree_node_get_row_data( clist, nodeList );
+       if( aio == NULL) return;
+       ds = addressbook_find_datasource( addrbook.treeSelected );
+       if( ds == NULL ) return;
 
-       if (alertpanel(_("Delete address(es)"),
-                      _("Really delete the address(es)?"),
-                      _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+       /* Test for read only */
+       iface = ds->interface;
+       if( iface->readOnly ) {
+               alertpanel( _("Delete address(es)"),
+                       _("This address data is readonly and cannot be deleted."),
+                       GTK_STOCK_CLOSE, NULL, NULL );
                return;
+       }
 
-       for (cur = clist->selection; cur != NULL; cur = next) {
-               next = cur->next;
-               row = GPOINTER_TO_INT(cur->data);
-               remFlag = FALSE;
+       /* Test whether Ok to proceed */
+       procFlag = FALSE;
+       if( pobj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(pobj);
+               if( ads->subType == ADDR_BOOK ) procFlag = TRUE;
+       }
+       else if( pobj->type == ADDR_ITEM_FOLDER ) {
+               procFlag = TRUE;
+       }
+       else if( pobj->type == ADDR_ITEM_GROUP ) {
+               procFlag = TRUE;
+       }
+       if( ! procFlag ) return;
+       abf = ds->rawDataSource;
+       if( abf == NULL ) return;
 
-               obj = gtk_clist_get_row_data(clist, row);
-               if (!obj) continue;
+       /* Confirm deletion */
+       aval = alertpanel( _("Delete address(es)"),
+                       _("Really delete the address(es)?"),
+                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+       if( aval != G_ALERTDEFAULT ) return;
 
-               if (pobj->type == ADDR_GROUP) {
-                       AddressGroup *group = ADDRESS_GROUP(pobj);
-                       group->items = g_list_remove(group->items, obj);
-               } else if (pobj->type == ADDR_FOLDER) {
-                       AddressFolder *folder = ADDRESS_FOLDER(pobj);
+       /* Process deletions */
+       if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
+               /* Items inside folders */
+               list = addrselect_get_list( _addressSelect_ );
 
-                       folder->items = g_list_remove(folder->items, obj);
-                       if (obj->type == ADDR_GROUP) {
-                               remFlag = TRUE;
-                       }
-                       else if (obj->type == ADDR_VCARD) {
-                               remFlag = TRUE;
+               node = list;
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = ( AddrItemObject * ) item->addressItem;
+                       if( aio->type == ADDR_ITEM_GROUP ) {
+                               ItemGroup *item = ( ItemGroup * ) aio;
+                               GtkCTreeNode *nd = NULL;
+
+                               nd = addressbook_find_group_node( addrbook.opened, item );
+                               item = addrbook_remove_group( abf, item );
+                               if( item ) {
+                                       addritem_free_item_group( item );
+                               }
+                               /* Remove group from parent node */
+                               gtk_ctree_remove_node( ctree, nd );
+                               refreshList = TRUE;
                        }
-                       else if (obj->type == ADDR_JPILOT) {
-                               remFlag = TRUE;
+                       else if( aio->type == ADDR_ITEM_PERSON ) {
+                               ItemPerson *item = ( ItemPerson * ) aio;
+                               addressbook_folder_remove_one_person( clist, item );
+                               if (pobj->type == ADDR_ITEM_FOLDER)
+                                       addritem_folder_remove_person(ADAPTER_FOLDER(pobj)->itemFolder, item);
+                               item = addrbook_remove_person( abf, item );
+                               if( item ) {
+                                       addritem_free_item_person( item );
+                               }
                        }
-                       else if (obj->type == ADDR_LDAP) {
-                               remFlag = TRUE;
+                       else if( aio->type == ADDR_ITEM_EMAIL ) {
+                               ItemEMail *item = ( ItemEMail * ) aio;
+                               ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
+                               item = addrbook_person_remove_email( abf, person, item );
+                               if( item ) {
+                                       addritem_free_item_email( item );
+                               }
+                               addressbook_folder_refresh_one_person( clist, person );
                        }
-
-                       if( remFlag ) {
-                               GtkCTreeNode *node;
-                               node = gtk_ctree_find_by_row_data
-                                       (ctree, addrbook.opened, obj);
-                               if (node) gtk_ctree_remove_node(ctree, node);
+               }
+               g_list_free( list );
+               addressbook_list_select_clear();
+               if( refreshList ) 
+                       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
+               addrbook_set_dirty(abf, TRUE);
+               addressbook_export_to_file();
+               addressbook_list_menu_setup();
+               return;
+       }
+       else if( pobj->type == ADDR_ITEM_GROUP ) {
+               /* Items inside groups */
+               list = addrselect_get_list( _addressSelect_ );
+               node = list;
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = ( AddrItemObject * ) item->addressItem;
+                       if( aio->type == ADDR_ITEM_EMAIL ) {
+                               ItemEMail *item = ( ItemEMail * ) aio;
+                               ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
+                               item = addrbook_person_remove_email( abf, person, item );
+                               if( item ) {
+                                       addritem_free_item_email( item );
+                               }
                        }
-               } else
-                       continue;
+               }
+               g_list_free( list );
+               addressbook_list_select_clear();
+               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
+               addrbook_set_dirty(abf, TRUE);
+               addressbook_export_to_file();
+               addressbook_list_menu_setup();
+               return;
+       }
 
-               addressbook_delete_object(obj);
+       gtk_ctree_node_set_row_data( clist, nodeList, NULL );
+       gtk_ctree_remove_node( clist, nodeList );
 
-               gtk_clist_remove(clist, row);
-       }
 }
 
 static void addressbook_reg_clicked(GtkButton *button, gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       GtkEntry *entry = GTK_ENTRY(addrbook.entry);
-       AddressObject *obj;
-       AddressItem *item;
-       gchar *str;
-
-       if (*gtk_entry_get_text(entry) == '\0') {
-               addressbook_new_address_cb(NULL, 0, NULL);
-               return;
-       }
-       if (!addrbook.opened) return;
-
-       obj = gtk_ctree_node_get_row_data(ctree, addrbook.opened);
-       if (!obj) return;
+       addressbook_new_address_cb( NULL, 0, NULL );
+}
 
-       g_return_if_fail(obj->type == ADDR_GROUP || obj->type == ADDR_FOLDER);
+gchar *addressbook_format_address( AddrItemObject * aio ) {
+       gchar *buf = NULL;
+       gchar *name = NULL;
+       gchar *address = NULL;
 
-       str = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       if( aio->type == ADDR_ITEM_EMAIL ) {
+               ItemPerson *person = NULL;
+               ItemEMail *email = ( ItemEMail * ) aio;
 
-       item = addressbook_parse_address(str);
-       g_free(str);
-       if (item) {
-               if (addressbook_find_object_by_name
-                       (addrbook.opened, item->name) != NULL) {
-                       addressbook_delete_object(ADDRESS_OBJECT(item));
-                       item = NULL;
-               } else if (addressbook_edit_address(item) == NULL) {
-                       addressbook_delete_object(ADDRESS_OBJECT(item));
-                       return;
+               person = ( ItemPerson * ) ADDRITEM_PARENT(email);
+               if( email->address ) {
+                       if( ADDRITEM_NAME(email) ) {
+                               name = ADDRITEM_NAME(email);
+                               if( *name == '\0' ) {
+                                       name = ADDRITEM_NAME(person);
+                               }
+                       }
+                       else if( ADDRITEM_NAME(person) ) {
+                               name = ADDRITEM_NAME(person);
+                       }
+                       else {
+                               buf = g_strdup( email->address );
+                       }
+                       address = email->address;
                }
        }
+       else if( aio->type == ADDR_ITEM_PERSON ) {
+               ItemPerson *person = ( ItemPerson * ) aio;
+               GList *node = person->listEMail;
 
-       if (!item) {
-               item = addressbook_edit_address(NULL);
-               if (!item) return;
+               name = ADDRITEM_NAME(person);
+               if( node ) {
+                       ItemEMail *email = ( ItemEMail * ) node->data;
+                       address = email->address;
+               }
        }
-
-       if (addressbook_find_object_by_name(addrbook.opened, item->name)) {
-               addressbook_delete_object(ADDRESS_OBJECT(item));
-               return;
+       if( address ) {
+               if( name && name[0] != '\0' ) {
+                       if( strchr_with_skip_quote( name, '"', ',' ) )
+                               buf = g_strdup_printf( "\"%s\" <%s>", name, address );
+                       else
+                               buf = g_strdup_printf( "%s <%s>", name, address );
+               }
+               else {
+                       buf = g_strdup( address );
+               }
        }
 
-       addressbook_add_object(addrbook.opened, ADDRESS_OBJECT(item));
-       addrbook.open_folder = TRUE;
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
+       return buf;
 }
 
-static AddressItem *addressbook_parse_address(const gchar *str)
+static void addressbook_to_clicked(GtkButton *button, gpointer data)
 {
-       gchar *name    = NULL;
-       gchar *address = NULL;
-       AddressItem *item;
-       gchar *buf;
-       gchar *start, *end;
-
-       Xalloca(buf, strlen(str) + 1, return NULL);
-
-       strcpy(buf, str);
-       g_strstrip(buf);
-       if (*buf == '\0') return NULL;
-
-       if ((start = strchr(buf, '<'))) {
-               if (start > buf) {
-                       *start = '\0';
-                       g_strstrip(buf);
-                       if (*buf != '\0')
-                               name = g_strdup(buf);
+       GList *list, *node;
+       Compose *compose;
+       AddrSelectItem *item;
+       AddrItemObject *aio;
+       gchar *addr;
+
+       compose = addrbook.target_compose;
+       if( ! compose ) return;
+
+       /* Nothing selected, but maybe there is something in text entry */
+       addr = (char *)gtk_entry_get_text( GTK_ENTRY( addrbook.entry) );
+       if ( addr ) {
+               compose_entry_append(
+                       compose, addr, (ComposeEntryType)data );
+       }
+
+       /* Select from address list */
+       list = addrselect_get_list( _addressSelect_ );
+       node = list;
+       while( node ) {
+               item = node->data;
+               node = g_list_next( node );
+               aio = item->addressItem;
+               if( aio->type == ADDR_ITEM_PERSON ||
+                   aio->type == ADDR_ITEM_EMAIL ) {
+                       addr = addressbook_format_address( aio );
+                       compose_entry_append(
+                               compose, addr, (ComposeEntryType) data );
+                       g_free( addr );
                }
-               start++;
-               if ((end = strchr(start, '>'))) {
-                       *end = '\0';
-                       g_strstrip(start);
-                       if (*start != '\0')
-                               address = g_strdup(start);
+               else if( aio->type == ADDR_ITEM_GROUP ) {
+                       ItemGroup *group = ( ItemGroup * ) aio;
+                       AddressDataSource *ds = NULL;
+                       AddressBookFile *abf = NULL;
+                       GList *nodeMail = group->listEMail;
+                       if (nodeMail == NULL) {
+                               if(addrbook.treeSelected ) {
+                                       ds = addressbook_find_datasource( addrbook.treeSelected );
+                                       abf = ds->rawDataSource;
+                                       if( abf != NULL )
+                                               nodeMail = addrbook_get_available_email_list( abf, group );
+                               }
+                       }
+                       while( nodeMail ) {
+                               ItemEMail *email = nodeMail->data;
+
+                               addr = addressbook_format_address(
+                                               ( AddrItemObject * ) email );
+                               compose_entry_append(
+                                       compose, addr, (ComposeEntryType) data );
+                               g_free( addr );
+                               nodeMail = g_list_next( nodeMail );
+                       }
                }
-       } else
-               name = g_strdup(buf);
+       }
+       g_list_free( list );
+}
 
-       if (!name && !address) return NULL;
+static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",   sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder",  sensitive );
 
-       item = mgu_create_address();
-       ADDRESS_OBJECT_TYPE(item) = ADDR_ITEM;
-       item->name    = name;
-       item->address = address;
-       item->remarks = NULL;
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",    sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",   sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",  sensitive );
 
-       return item;
-}
-
-static void addressbook_to_clicked(GtkButton *button, gpointer data)
-{
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
-       GList *cur;
-
-       if (!addrbook.target_compose) return;
-
-       for (cur = clist->selection; cur != NULL; cur = cur->next) {
-               AddressObject *obj;
-
-               obj = gtk_clist_get_row_data(clist,
-                                            GPOINTER_TO_INT(cur->data));
-               if (!obj) return;
-
-               if (obj->type == ADDR_ITEM) {
-                       addressbook_append_to_compose_entry
-                               (ADDRESS_ITEM(obj), (ComposeEntryType)data);
-               } else if (obj->type == ADDR_GROUP) {
-                       AddressGroup *group;
-                       GList *cur_item;
-
-                       group = ADDRESS_GROUP(obj);
-                       for (cur_item = group->items; cur_item != NULL;
-                            cur_item = cur_item->next) {
-                               if (ADDRESS_OBJECT(cur_item->data)->type
-                                   != ADDR_ITEM)
-                                       continue;
-                               addressbook_append_to_compose_entry
-                                       (ADDRESS_ITEM(cur_item->data),
-                                        (ComposeEntryType)data);
-                       }
-               }
-       }
-}
-
-static void addressbook_append_to_compose_entry(AddressItem *item,
-                                               ComposeEntryType type)
-{
-       Compose *compose = addrbook.target_compose;
-
-       if (item->name && item->address) {
-               gchar *buf;
-
-               buf = g_strdup_printf
-                       ("%s <%s>", item->name, item->address);
-               compose_entry_append(compose, buf, type);
-               g_free(buf);
-       } else if (item->address)
-               compose_entry_append(compose, item->address, type);
-}
-
-static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
-       menu_set_sensitive( addrbook.menu_factory, "/File/New Address", sensitive );
-       menu_set_sensitive( addrbook.menu_factory, "/File/New Group",   sensitive );
-       menu_set_sensitive( addrbook.menu_factory, "/File/New Folder",  sensitive );
-       menu_set_sensitive( addrbook.menu_factory, "/File/New V-Card",  sensitive );
-#ifdef USE_JPILOT
-       menu_set_sensitive( addrbook.menu_factory, "/File/New J-Pilot", sensitive );
-#endif
-#ifdef USE_LDAP
-       menu_set_sensitive( addrbook.menu_factory, "/File/New Server",  sensitive );
-#endif
+       menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/New Group",   sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To",     sensitive );
        gtk_widget_set_sensitive( addrbook.reg_btn, sensitive );
+       gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
        gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
 }
 
 static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode *node ) {
-       gboolean canEdit = TRUE;
-       if( obj->type == ADDR_FOLDER ) {
-               if( node == addrbook.common ) {
-                       canEdit = FALSE;
+       gboolean canEdit = FALSE;
+       gboolean canDelete = TRUE;
+       gboolean canAdd = FALSE;
+       gboolean canEditTr = TRUE;
+       gboolean editAddress = FALSE;
+       gboolean canExport = TRUE;
+       AddressTypeControlItem *atci = NULL;
+       AddressDataSource *ds = NULL;
+       AddressInterface *iface = NULL;
+
+       if( obj == NULL ) return;
+       if( obj->type == ADDR_INTERFACE ) {
+               AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
+               iface = adapter->interface;
+               if( iface ) {
+                       if( iface->haveLibrary ) {
+                               /* Enable appropriate File / New command */
+                               atci = adapter->atci;
+                               menu_set_sensitive( addrbook.menu_factory, atci->menuCommand, TRUE );
+                       }
                }
-               if( node == addrbook.personal ) {
-                       canEdit = FALSE;
+               canEditTr = canExport = FALSE;
+       }
+       else if( obj->type == ADDR_DATASOURCE ) {
+               AdapterDSource *ads = ADAPTER_DSOURCE(obj);
+               ds = ads->dataSource;
+               iface = ds->interface;
+               if( ! iface->readOnly ) {
+                       canAdd = canEdit = editAddress = canDelete = TRUE;
                }
-               if( node == addrbook.vcard ) {
-                       canEdit = FALSE;
-                       menu_set_sensitive( addrbook.menu_factory, "/File/New V-Card", TRUE );
+               if( ! iface->haveLibrary ) {
+                       canAdd = canEdit = editAddress = canExport = canDelete = FALSE;
                }
-#ifdef USE_JPILOT
-               else if( node == addrbook.jpilot ) {
-                       canEdit = FALSE;
-                       if( _have_pilot_library_ ) {
-                               menu_set_sensitive( addrbook.menu_factory, "/File/New J-Pilot", TRUE );
+       }
+       else if( obj->type == ADDR_ITEM_FOLDER ) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               if( ds ) {
+                       iface = ds->interface;
+                       if( iface->readOnly ) {
+                               canEditTr = FALSE;
+                               canDelete = FALSE;
                        }
-               }
-#endif
-#ifdef USE_LDAP
-               else if( node == addrbook.ldap ) {
-                       canEdit = FALSE;
-                       if( _have_ldap_library_ ) {
-                               menu_set_sensitive( addrbook.menu_factory, "/File/New Server", TRUE );
+                       else {
+                               canAdd = editAddress = TRUE;
                        }
                }
-#endif
-               else {
-                       menu_set_sensitive( addrbook.menu_factory, "/File/New Address", TRUE );
-                       menu_set_sensitive( addrbook.menu_factory, "/File/New Group",   TRUE );
-                       menu_set_sensitive( addrbook.menu_factory, "/File/New Folder",  TRUE );
-                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-                       gtk_widget_set_sensitive( addrbook.del_btn, TRUE );
-               }
-       }
-       else if( obj->type == ADDR_GROUP ) {
-               menu_set_sensitive( addrbook.menu_factory, "/File/New Address", TRUE );
-               gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-               gtk_widget_set_sensitive( addrbook.del_btn, TRUE );
-       }
-#ifdef USE_JPILOT
-       else if( obj->type == ADDR_JPILOT ) {
-               if( ! _have_pilot_library_ ) canEdit = FALSE;
-       }
-       else if( obj->type == ADDR_CATEGORY ) {
-               canEdit = FALSE;
        }
-#endif
-#ifdef USE_LDAP
-       else if( obj->type == ADDR_LDAP ) {
-               if( ! _have_ldap_library_ ) canEdit = FALSE;
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               if( ds ) {
+                       iface = ds->interface;
+                       if( ! iface->readOnly ) {
+                               editAddress = TRUE;
+                       }
+               }
        }
-#endif
-       menu_set_sensitive( addrbook.menu_factory, "/File/Edit",    canEdit );
-       menu_set_sensitive( addrbook.menu_factory, "/File/Delete",  canEdit );
+
+       if( addrbook.listSelected == NULL ) canEdit = FALSE;
+
+       /* Enable add */
+       menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", editAddress );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/New Group",   canAdd );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder",  canAdd );
+       gtk_widget_set_sensitive( addrbook.reg_btn, editAddress );
+
+       /* Enable edit */
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Edit",   canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
+       gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
+       gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
+
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",      canEditTr );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book",    canEditTr );
+
+       /* Export data */
+       menu_set_sensitive( addrbook.menu_factory, "/Tools/Export HTML...", canExport );
+       menu_set_sensitive( addrbook.menu_factory, "/Tools/Export LDIF...", canExport );
 }
 
-static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
+static void addressbook_list_menu_setup( void );
+
+/**
+ * Address book tree callback function that responds to selection of tree
+ * items.
+ *
+ * \param ctree  Tree widget.
+ * \param node   Node that was selected.
+ * \param column Column number where selected occurred.
+ * \param data   Pointer to user data.
+ */
+static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                                      gint column, gpointer data)
 {
-       AddressObject *obj;
-
-       addrbook.selected = node;
-       addrbook.open_folder = FALSE;
+       AddressObject *obj = NULL;
+       AdapterDSource *ads = NULL;
+       AddressDataSource *ds = NULL;
+       ItemFolder *rootFolder = NULL;
+       AddressObjectType aot;
+
+       addrbook.treeSelected = node;
+       addrbook.listSelected = NULL;
        addressbook_status_show( "" );
-       if( addrbook.entry != NULL ) {
-               gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
-       }
+       if( addrbook.entry != NULL ) gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
 
-       obj = gtk_ctree_node_get_row_data(ctree, node);
-       if( obj == NULL ) return;
+       if( addrbook.clist ) gtk_clist_clear( GTK_CLIST(addrbook.clist) );
+       if( node ) obj = gtk_ctree_node_get_row_data( ctree, node );
+       if( obj == NULL ) return FALSE;
 
        addrbook.opened = node;
 
-       if(     obj->type == ADDR_GROUP || obj->type == ADDR_FOLDER ||
-               obj->type == ADDR_VCARD || obj->type == ADDR_JPILOT ||
-               obj->type == ADDR_CATEGORY || obj->type == ADDR_LDAP ) {
-               addressbook_set_clist(obj);
-       }
-
-       if( obj->type == ADDR_VCARD ) {
-               // Read from file
-               VCardFile *vcf;
-               vcf = ADDRESS_VCARD(obj)->cardFile;
-               vcard_read_data( vcf );
-               addressbook_vcard_show_message( vcf );
-               ADDRESS_VCARD(obj)->items = vcard_get_address_list( vcf );
-               addressbook_set_clist( obj );
-       }
-#ifdef USE_JPILOT
-       else if( obj->type == ADDR_JPILOT ) {
-               if( _have_pilot_library_ ) {
-                       // Read from file
-                       JPilotFile *jpf;
-                       GList *catList, *catNode;
-                       AddressCategory *acat;
-                       GtkCTreeNode *childNode, *nextNode;
-                       GtkCTreeRow *currRow;
-
-                       jpf = ADDRESS_JPILOT(obj)->pilotFile;
-                       addressbook_jpilot_show_message( jpf );
-                       if( jpilot_get_modified( jpf ) ) {
-                               jpilot_read_data( jpf );
-                               catList = jpilot_get_category_items( jpf );
-
-                               // Remove existing categories
-                               currRow = GTK_CTREE_ROW( node );
-                               if( currRow ) {
-                                       while( nextNode = currRow->children ) {
-                                               gtk_ctree_remove_node( ctree, nextNode );
-                                       }
-                               }
+       if( obj->type == ADDR_DATASOURCE ) {
+               /* Read from file */
+               static gboolean tVal = TRUE;
 
-                               // Load new categories into the tree.
-                               catNode = catList;
-                               while( catNode ) {
-                                       AddressItem *item = catNode->data;
-                                       acat = g_new(AddressCategory, 1);
-                                       ADDRESS_OBJECT_TYPE(acat) = ADDR_CATEGORY;
-                                       acat->name = g_strdup( item->name );
-                                       acat->items = NULL;
-                                       acat->pilotFile = jpf;
-                                       acat->category = item;
-                                       catNode = g_list_next( catNode );
-                                       addressbook_add_object(node, ADDRESS_OBJECT(acat));
-                               }
+               ads = ADAPTER_DSOURCE(obj);
+               if( ads == NULL ) return FALSE;
+               ds = ads->dataSource;
+               if( ds == NULL ) return FALSE;          
 
-                               ADDRESS_JPILOT(obj)->items = catList;
-                       }
-                       addressbook_set_clist( obj );
+               if( addrindex_ds_get_modify_flag( ds ) ) {
+                       addrindex_ds_read_data( ds );
                }
-       }
-       else if( obj->type == ADDR_CATEGORY ) {
-               if( _have_pilot_library_ ) {
-                       // Read from file
-                       JPilotFile *jpf;
 
-                       jpf = ADDRESS_JPILOT(obj)->pilotFile;
-                       if( jpilot_get_modified( jpf ) ) {
-                               // Force parent to be reloaded
-                               gtk_ctree_select( GTK_CTREE(addrbook.ctree), GTK_CTREE_ROW(node)->parent);
-                               gtk_ctree_expand( GTK_CTREE(addrbook.ctree), GTK_CTREE_ROW(node)->parent);
+               if( ! addrindex_ds_get_read_flag( ds ) ) {
+                       addrindex_ds_read_data( ds );
+               }
+               addressbook_ds_show_message( ds );
+
+               if( ! addrindex_ds_get_access_flag( ds ) ) {
+                       /* Remove existing folders and groups */
+                       gtk_clist_freeze( GTK_CLIST(ctree) );
+                       addressbook_tree_remove_children( ctree, node );
+                       gtk_clist_thaw( GTK_CLIST(ctree) );
+
+                       /* Load folders into the tree */
+                       rootFolder = addrindex_ds_get_root_folder( ds );
+                       if( ds->type == ADDR_IF_JPILOT ) {
+                               aot = ADDR_CATEGORY;
                        }
-                       else {
-                               AddressItem *item = NULL;
-                               AddressCategory *acat = ADDRESS_CATEGORY(obj);
-                               if( acat ) item = acat->category;
-                               if( item ) {
-                                       ADDRESS_CATEGORY(obj)->items =
-                                               jpilot_get_address_list_cat( jpf, item->categoryID );
-                               }
-                               addressbook_set_clist( obj );
+                       else if( ds->type == ADDR_IF_LDAP ) {
+                               aot = ADDR_LDAP_QUERY;
                        }
-               }
-       }
-#endif
-#ifdef USE_LDAP
-       else if( obj->type == ADDR_LDAP ) {
-               if( _have_ldap_library_ ) {
-                       // Read from cache
-                       SyldapServer *server;
-                       server = ADDRESS_LDAP(obj)->ldapServer;
-                       addressbook_ldap_show_message( server );
-                       if( ! server->busyFlag ) {
-                               ADDRESS_LDAP(obj)->items = syldap_get_address_list( server );
-                               addressbook_set_clist( obj );
+                       else {
+                               aot = ADDR_ITEM_FOLDER;
                        }
+                       addressbook_node_add_folder( node, ds, rootFolder, aot );
+                       addrindex_ds_set_access_flag( ds, &tVal );
+                       gtk_ctree_expand( ctree, node );
                }
        }
-#endif
 
-       // Setup main menu selections
+       /* Update address list */
+       addressbook_set_clist( obj );
+
+       /* Setup main menu selections */
        addressbook_menubar_set_sensitive( FALSE );
+       addressbook_list_menu_setup();
        addressbook_menuitem_set_sensitive( obj, node );
-}
-
-static void addressbook_list_selected(GtkCList *clist, gint row, gint column,
-                                     GdkEvent *event, gpointer data)
-{
-       GtkEntry *entry = GTK_ENTRY(addrbook.entry);
-       AddressObject *obj;
-       GList *cur;
 
-       if (event && event->type == GDK_2BUTTON_PRESS) {
-               if (prefs_common.add_address_by_click &&
-                   addrbook.target_compose)
-                       addressbook_to_clicked(NULL, NULL);
-               else
-                       addressbook_edit_address_cb(NULL, 0, NULL);
-               return;
-       }
+       addressbook_list_select_clear();
+       addressbook_list_menu_setup();
+       return FALSE;
+}
 
-#if 0
-       gtk_signal_handler_block_by_func
-               (GTK_OBJECT(entry),
-                GTK_SIGNAL_FUNC(addressbook_entry_changed), NULL);
-#endif          
-
-       gtk_entry_set_text(entry, "");
-
-       for (cur = clist->selection; cur != NULL; cur = cur->next) {
-               obj = gtk_clist_get_row_data(clist,
-                                            GPOINTER_TO_INT(cur->data));
-               g_return_if_fail(obj != NULL);
-
-               if (obj->type == ADDR_ITEM) {
-                       AddressItem *item;
-
-                       item = ADDRESS_ITEM(obj);
-                       if (item->name && item->address) {
-                               gchar *buf;
-
-                               buf = g_strdup_printf
-                                       ("%s <%s>", item->name, item->address);
-                               if (*gtk_entry_get_text(entry) != '\0')
-                                       gtk_entry_append_text(entry, ", ");
-                               gtk_entry_append_text(entry, buf);
-                               g_free(buf);
-                       } else if (item->address) {
-                               if (*gtk_entry_get_text(entry) != '\0')
-                                       gtk_entry_append_text(entry, ", ");
-                               gtk_entry_append_text(entry, item->address);
+/**
+ * Setup address list popup menu items. Items are enabled or disabled as
+ * required.
+ */
+static void addressbook_list_menu_setup( void ) {
+       GtkCTree *clist = NULL;
+       AddressObject *pobj = NULL;
+       AddressObject *obj = NULL;
+       AdapterDSource *ads = NULL;
+       AddressInterface *iface = NULL;
+       AddressDataSource *ds = NULL;
+       gboolean canEdit = FALSE;
+       gboolean canDelete = FALSE;
+       gboolean canCut = FALSE;
+       gboolean canCopy = FALSE;
+       gboolean canPaste = FALSE;
+       gboolean canBrowse = FALSE;
+
+       pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       if( pobj == NULL ) return;
+
+       clist = GTK_CTREE(addrbook.clist);
+       obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+       if( obj == NULL ) canEdit = FALSE;
+
+       menu_set_insensitive_all( GTK_MENU_SHELL(addrbook.list_popup) );
+
+       if( pobj->type == ADDR_DATASOURCE ) {
+               /* Parent object is a data source */
+               ads = ADAPTER_DSOURCE(pobj);
+               ds = ads->dataSource;
+               iface = ds->interface;
+               if( ! iface->readOnly ) {
+                       menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+                       menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+                       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
+                       if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+                       if( obj ) canEdit = TRUE;
+               }
+               canDelete = canEdit;
+       }
+       else if( pobj->type != ADDR_INTERFACE ) {
+               /* Parent object is not an interface */
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               iface = ds->interface;
+               if( ! iface->readOnly ) {
+                       /* Folder or group */
+                       if( pobj->type == ADDR_ITEM_FOLDER || pobj->type == ADDR_ITEM_GROUP ) {
+                               menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+                               gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+                               if( obj ) canEdit = TRUE;
+                       }
+                       /* Folder */
+                       if( pobj->type == ADDR_ITEM_FOLDER ) {
+                               menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+                               if( obj ) canEdit = TRUE;
                        }
+                       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
+                       if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+                       canDelete = canEdit;
+               }
+               if( iface->type == ADDR_IF_LDAP ) {
+                       if( obj ) canBrowse = TRUE;
+                       canEdit = TRUE;
+                       canDelete = FALSE;
                }
        }
+       if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
 
-#if 0
-       gtk_signal_handler_unblock_by_func
-               (GTK_OBJECT(entry),
-                GTK_SIGNAL_FUNC(addressbook_entry_changed), NULL);
-#endif          
-}
+       /* Disable edit or browse if more than one row selected */
+       if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
+               canEdit = FALSE;
+               canBrowse = FALSE;
+       }
 
-#if 0
-static void addressbook_entry_changed(GtkWidget *widget)
-{
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
-       GtkEntry *entry = GTK_ENTRY(addrbook.entry);
-       const gchar *str;
-       gint len;
-       gint row;
+       /* Now go finalize menu items */
+       menu_set_sensitive( addrbook.list_factory, "/Edit",   canEdit );
+       menu_set_sensitive( addrbook.list_factory, "/Delete", canDelete );
 
-       //if (clist->selection && clist->selection->next) return;
+       menu_set_sensitive( addrbook.list_factory, "/Cut",           canCut );
+       menu_set_sensitive( addrbook.list_factory, "/Copy",          canCopy );
+       menu_set_sensitive( addrbook.list_factory, "/Paste",         canPaste );
+/*     menu_set_sensitive( addrbook.list_factory, "/Paste Address", canPaste );*/
 
-       str = gtk_entry_get_text(entry);
-       if (*str == '\0') {
-               gtk_clist_unselect_all(clist);
-               return;
-       }
-       len = strlen(str);
+       menu_set_sensitive( addrbook.list_factory, "/Mail To",       canCopy );
 
-       for (row = 0; row < clist->rows; row++) {
-               AddressObject *obj;
-               const gchar *name;
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",           canCut );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",          canCopy );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",         canPaste );
+/*     menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
 
-               obj = ADDRESS_OBJECT(gtk_clist_get_row_data(clist, row));
-               if (!obj) continue;
-               if (obj->type == ADDR_ITEM)
-                       name = ADDRESS_ITEM(obj)->name;
-               else if (obj->type == ADDR_GROUP)
-                       name = ADDRESS_GROUP(obj)->name;
-               else
-                       continue;
+       menu_set_sensitive( addrbook.tree_factory, "/Cut",             canCut );
+       menu_set_sensitive( addrbook.tree_factory, "/Copy",            canCopy );
+       menu_set_sensitive( addrbook.tree_factory, "/Paste",           canPaste );
 
-               if (name && !strncasecmp(name, str, len)) {
-                       gtk_clist_unselect_all(clist);
-                       gtk_clist_select_row(clist, row, -1);
-                       return;
-               }
-       }
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Edit",    canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Delete",  canDelete );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", canCopy );
 
-       gtk_clist_unselect_all(clist);
-}
+       gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
+       gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
+
+#ifdef USE_LDAP
+       menu_set_sensitive( addrbook.list_factory, "/Browse Entry",    canBrowse );
 #endif
+}
 
-static void addressbook_entry_gotfocus( GtkWidget *widget ) {
-       gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
+static void addressbook_select_row_tree        (GtkCTree       *ctree,
+                                        GtkCTreeNode   *node,
+                                        gint            column,
+                                        gpointer        data)
+{
 }
 
-static void addressbook_list_button_pressed(GtkWidget *widget,
-                                           GdkEventButton *event,
-                                           gpointer data)
+/**
+ * Add list of items into tree node below specified tree node.
+ * \param treeNode  Tree node.
+ * \param ds        Data source.
+ * \param listItems List of items.
+ */
+static void addressbook_treenode_add_list(
+       GtkCTreeNode *treeNode, AddressDataSource *ds, GList *listItems )
 {
-       GtkCList *clist = GTK_CLIST(widget);
-       gint row, column;
-       gint tRow, tCol;
-       AddressObject *obj, *pobj;
+       GList *node;
 
-       if (!event) return;
+       node = listItems;
+       while( node ) {
+               AddrItemObject *aio;
+               GtkCTreeNode *nn;
 
-       obj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
-                                         addrbook.opened);
-       g_return_if_fail(obj != NULL);
+               aio = node->data;
+               if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_GROUP ) {
+                       ItemGroup *group;
 
-       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.selected);
-       if( pobj ) {
-               if(     pobj->type == ADDR_VCARD ||
-                       pobj->type == ADDR_JPILOT ||
-                       pobj->type == ADDR_CATEGORY ||
-                       pobj->type == ADDR_LDAP ) {
-                       menu_set_sensitive(addrbook.menu_factory, "/File/Edit", FALSE);
-                       menu_set_sensitive(addrbook.menu_factory, "/File/Delete", FALSE);
+                       group = ( ItemGroup * ) aio;
+                       nn = addressbook_node_add_group( treeNode, ds, group );
+               }
+               else if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_FOLDER ) {
+                       ItemFolder *folder;
+
+                       folder = ( ItemFolder * ) aio;
+                       nn = addressbook_node_add_folder(
+                               treeNode, ds, folder, ADDR_ITEM_FOLDER );
                }
+               node = g_list_next( node );
        }
+}
 
-       if (event->button != 3) return;
-       menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.list_popup));
+/**
+ * Cut from address list widget.
+ */
+static void addressbook_clip_cut_cb( void ) {
+       _clipBoard_->cutFlag = TRUE;
+       addrclip_clear( _clipBoard_ );
+       addrclip_add( _clipBoard_, _addressSelect_ );
+       /* addrclip_list_show( _clipBoard_, stdout ); */
+}
 
-       if (gtk_clist_get_selection_info
-               (clist, event->x, event->y, &row, &column)) {
-               GtkCListRow *clist_row;
+/**
+ * Copy from address list widget.
+ */
+static void addressbook_clip_copy_cb( void ) {
+       _clipBoard_->cutFlag = FALSE;
+       addrclip_clear( _clipBoard_ );
+       addrclip_add( _clipBoard_, _addressSelect_ );
+       /* addrclip_list_show( _clipBoard_, stdout ); */
+}
 
-               clist_row = g_list_nth(clist->row_list, row)->data;
-               if (clist_row->state != GTK_STATE_SELECTED) {
-                       gtk_clist_unselect_all(clist);
-                       gtk_clist_select_row(clist, row, column);
-               }
-               gtkut_clist_set_focus_row(clist, row);
+/**
+ * Paste clipboard into address list widget.
+ */
+static void addressbook_clip_paste_cb( void ) {
+       GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+       AddressObject *pobj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       ItemFolder *folder = NULL;
+       GList *folderGroup = NULL;
+
+       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+       if( ds == NULL ) return;
+       if( addrindex_ds_get_readonly( ds ) ) {
+               addressbook_ds_status_message(
+                       ds, _( "Cannot paste. Target address book is readonly." ) );
+               return;
+       }
 
-               if(     obj->type != ADDR_VCARD &&
-                       obj->type != ADDR_JPILOT &&
-                       obj->type != ADDR_CATEGORY &&
-                       obj->type != ADDR_LDAP ) {
-                       menu_set_sensitive(addrbook.list_factory, "/Edit", TRUE);
-                       menu_set_sensitive(addrbook.list_factory, "/Delete", TRUE);
+       pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+       if( pobj ) {
+               if( pobj->type == ADDR_ITEM_FOLDER ) {
+                       folder = ADAPTER_FOLDER(pobj)->itemFolder;
+               }
+               else if( pobj->type == ADDR_ITEM_GROUP ) {
+                       addressbook_ds_status_message(
+                               ds, _( "Cannot paste into an address group." ) );
+                       return;
                }
        }
 
-       if( !(  addrbook.opened == addrbook.vcard ||
-               addrbook.opened == addrbook.jpilot ||
-               addrbook.opened == addrbook.ldap ) ) {
+       /* Get an address book */
+       abf = addressbook_get_book_file();
+       if( abf == NULL ) return;
 
-               if( obj->type == ADDR_FOLDER || obj->type == ADDR_GROUP ) {
-                       menu_set_sensitive(addrbook.list_factory, "/New Address", TRUE);
-                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-                       gtk_widget_set_sensitive( addrbook.del_btn, TRUE );
-               }
-               if (obj->type == ADDR_FOLDER) {
-                       menu_set_sensitive(addrbook.list_factory, "/New Folder", TRUE);
-                       menu_set_sensitive(addrbook.list_factory, "/New Group", TRUE);
-               }
+       if( _clipBoard_->cutFlag ) {
+               /* Paste/Cut */
+               folderGroup = addrclip_paste_cut( _clipBoard_, abf, folder );
+
+               /* Remove all groups and folders in clipboard from tree node */
+               addressbook_treenode_remove_item();
+
+               /* Remove all "cut" items */
+               addrclip_delete_item( _clipBoard_ );
+
+               /* Clear clipboard - cut items??? */
+               addrclip_clear( _clipBoard_ );
+       }
+       else {
+               /* Paste/Copy */
+               folderGroup = addrclip_paste_copy( _clipBoard_, abf, folder );
        }
-       gtk_menu_popup(GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
-                      event->button, event->time);
-}
 
-static void addressbook_list_button_released(GtkWidget *widget,
-                                            GdkEventButton *event,
-                                            gpointer data)
-{
+       /* addrclip_list_show( _clipBoard_, stdout ); */
+       if( folderGroup ) {
+               /* Update tree by inserting node for each folder or group */
+               addressbook_treenode_add_list(
+                       addrbook.treeSelected, ds, folderGroup );
+               gtk_ctree_expand( ctree, addrbook.treeSelected );
+               g_list_free( folderGroup );
+               folderGroup = NULL;
+       }
+
+       /* Display items pasted */
+       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
+
 }
 
-static void addressbook_tree_button_pressed(GtkWidget *ctree,
-                                           GdkEventButton *event,
-                                           gpointer data)
-{
-       GtkCList *clist = GTK_CLIST(ctree);
-       gint row, column;
-       AddressObject *obj;
-       GtkCTreeNode *node;
+#if 0
+/**
+ * Paste clipboard email addresses only into address list widget.
+ */
+static void addressbook_clip_paste_address_cb( void ) {
+       GtkCTree *clist = GTK_CTREE(addrbook.clist);
+       GtkCTree *ctree;
+       AddressObject *pobj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       ItemFolder *folder = NULL;
+       AddrItemObject *aio;
+       gint cnt;
+
+       if( addrbook.listSelected == NULL ) return;
 
-       if (!event) return;
-       if (event->button == 1) {
-               addrbook.open_folder = TRUE;
+               ctree = GTK_CTREE( addrbook.ctree );
+       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+       if( ds == NULL ) return;
+       if( addrindex_ds_get_readonly( ds ) ) {
+               addressbook_ds_status_message(
+                       ds, _( "Cannot paste. Target address book is readonly." ) );
                return;
        }
-       if (event->button != 3) return;
 
-       if (!gtk_clist_get_selection_info
-               (clist, event->x, event->y, &row, &column)) return;
-       gtk_clist_select_row(clist, row, column);
+       pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+       if( pobj ) {
+               if( pobj->type == ADDR_ITEM_FOLDER ) {
+                       folder = ADAPTER_FOLDER(pobj)->itemFolder;
+               }
+       }
 
-       obj = gtk_clist_get_row_data(clist, row);
-       g_return_if_fail(obj != NULL);
+       abf = addressbook_get_book_file();
+       if( abf == NULL ) return;
 
-       menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
+       cnt = 0;
+       aio = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+       if( aio->type == ADDR_ITEM_PERSON ) {
+               ItemPerson *person;
 
-       if (obj->type == ADDR_FOLDER) {
-               node = gtk_ctree_node_nth(GTK_CTREE(ctree), row);
-               if( node == addrbook.vcard ) {
-                       menu_set_sensitive(addrbook.tree_factory, "/New V-Card", TRUE);
-               }
-#ifdef USE_JPILOT
-               else if( node == addrbook.jpilot ) {
-                       if( _have_pilot_library_ ) {
-                               menu_set_sensitive(addrbook.tree_factory, "/New J-Pilot", TRUE);
-                       }
-               }
-#endif
-#ifdef USE_LDAP
-               else if( node == addrbook.ldap ) {
-                       if( _have_ldap_library_ ) {
-                               menu_set_sensitive(addrbook.tree_factory, "/New Server", TRUE);
-                       }
+               person = ( ItemPerson * ) aio;
+               if( _clipBoard_->cutFlag ) {
+                       /* Paste/Cut */
+                       cnt = addrclip_paste_person_cut( _clipBoard_, abf, person );
+
+                       /* Remove all "cut" items */
+                       addrclip_delete_address( _clipBoard_ );
+
+                       /* Clear clipboard */
+                       addrclip_clear( _clipBoard_ );
                }
-#endif
                else {
-                       menu_set_sensitive(addrbook.tree_factory, "/New Address", TRUE);
-                       menu_set_sensitive(addrbook.tree_factory, "/New Folder", TRUE);
-                       menu_set_sensitive(addrbook.tree_factory, "/New Group", TRUE);
-                       if (node && GTK_CTREE_ROW(node)->level >= 2) {
-                               menu_set_sensitive(addrbook.tree_factory, "/Edit", TRUE);
-                               menu_set_sensitive(addrbook.tree_factory, "/Delete", TRUE);
-                       }
-                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-                       gtk_widget_set_sensitive( addrbook.del_btn, TRUE );
-               }
-       }
-       else if (obj->type == ADDR_GROUP) {
-               menu_set_sensitive(addrbook.tree_factory, "/New Address", TRUE);
-               menu_set_sensitive(addrbook.tree_factory, "/Edit", TRUE);
-               menu_set_sensitive(addrbook.tree_factory, "/Delete", TRUE);
-               gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-               gtk_widget_set_sensitive( addrbook.del_btn, TRUE );
-       }
-       else if (obj->type == ADDR_VCARD) {
-               menu_set_sensitive(addrbook.tree_factory, "/Edit", TRUE);
-               menu_set_sensitive(addrbook.tree_factory, "/Delete", TRUE);
-       }
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               if( _have_pilot_library_ ) {
-                       menu_set_sensitive(addrbook.tree_factory, "/Edit", TRUE);
-                       menu_set_sensitive(addrbook.tree_factory, "/Delete", TRUE);
-               }
-       }
-       else if (obj->type == ADDR_CATEGORY) {
-               if( _have_pilot_library_ ) {
-                       menu_set_sensitive(addrbook.tree_factory, "/Edit", FALSE);
-                       menu_set_sensitive(addrbook.tree_factory, "/Delete", FALSE);
+                       /* Paste/Copy */
+                       cnt = addrclip_paste_person_copy( _clipBoard_, abf, person );
                }
-       }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               if( _have_ldap_library_ ) {
-                       menu_set_sensitive(addrbook.tree_factory, "/Edit", TRUE);
-                       menu_set_sensitive(addrbook.tree_factory, "/Delete", TRUE);
+               if( cnt > 0 ) {
+                       addritem_person_set_opened( person, TRUE );
                }
        }
-#endif
-       else {
-               return;
-       }
-       gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
-                      event->button, event->time);
-}
 
-static void addressbook_tree_button_released(GtkWidget *ctree,
-                                            GdkEventButton *event,
-                                            gpointer data)
-{
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
-       gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
+       /* Display items pasted */
+       if( cnt > 0 ) {
+               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
+       }
 }
+#endif
 
-static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
-{
-       if (!addrbook.opened) return;
+/**
+ * Add current treenode object to clipboard. Note that widget only allows
+ * one entry from the tree list to be selected.
+ */
+static void addressbook_treenode_to_clipboard( void ) {
+       AddressObject *obj = NULL;
+       AddressDataSource *ds = NULL;
+       AddrSelectItem *item;
+       GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+       GtkCTreeNode *node;
 
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
-       gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
-                                 addrbook.opened);
-}
+       node = addrbook.treeSelected;
+       if( node == NULL ) return;
+       obj = gtk_ctree_node_get_row_data( ctree, node );
+       if( obj == NULL ) return;
 
-static void addressbook_new_folder_cb(gpointer data, guint action,
-                                     GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *obj;
-       AddressFolder *folder;
-       gchar *new_folder;
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
 
-       if (!addrbook.selected) return;
+       item = NULL;
+       if( obj->type == ADDR_ITEM_FOLDER ) {
+               AdapterFolder *adapter = ADAPTER_FOLDER(obj);
+               ItemFolder *folder = adapter->itemFolder;
 
-       obj = gtk_ctree_node_get_row_data(ctree, addrbook.selected);
-       g_return_if_fail(obj != NULL);
-       if (obj->type != ADDR_FOLDER) return;
-
-       new_folder = input_dialog(_("New folder"),
-                                 _("Input the name of new folder:"),
-                                 _("NewFolder"));
-       if (!new_folder) return;
-       g_strstrip(new_folder);
-       if (*new_folder == '\0') {
-               g_free(new_folder);
-               return;
+               item = addrselect_create_node( obj );
+               item->uid = g_strdup( ADDRITEM_ID(folder) );
        }
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               AdapterGroup *adapter = ADAPTER_GROUP(obj);
+               ItemGroup *group = adapter->itemGroup;
 
-       if (gtk_ctree_find_by_row_data_custom(ctree, addrbook.selected,
-                                             new_folder,
-                                             addressbook_obj_name_compare)) {
-               alertpanel_error(_("The name already exists."));
-               g_free(new_folder);
-               return;
+               item = addrselect_create_node( obj );
+               item->uid = g_strdup( ADDRITEM_ID(group) );
+       }
+       else if( obj->type == ADDR_DATASOURCE ) {
+               /* Data source */
+               item = addrselect_create_node( obj );
+               item->uid = NULL;
        }
 
-       folder = g_new(AddressFolder, 1);
-       ADDRESS_OBJECT_TYPE(folder) = ADDR_FOLDER;
-       folder->name = g_strdup(new_folder);
-       folder->items = NULL;
-
-       addressbook_add_object(addrbook.selected, ADDRESS_OBJECT(folder));
+       if( item ) {
+               /* Clear existing list and add item into list */
+               gchar *cacheID;
 
-       g_free(new_folder);
+               addressbook_list_select_clear();
+               cacheID = addrindex_get_cache_id( _addressIndex_, ds );
+               addrselect_list_add( _addressSelect_, item, cacheID );
+               g_free( cacheID );
+       }
+}
 
-       if (addrbook.selected == addrbook.opened)
-               addressbook_set_clist(obj);
+/**
+ * Cut from tree widget.
+ */
+static void addressbook_treenode_cut_cb( void ) {
+       _clipBoard_->cutFlag = TRUE;
+       addressbook_treenode_to_clipboard();
+       addrclip_clear( _clipBoard_ );
+       addrclip_add( _clipBoard_, _addressSelect_ );
+       /* addrclip_list_show( _clipBoard_, stdout ); */
 }
 
-static void addressbook_new_group_cb(gpointer data, guint action,
-                                    GtkWidget *widget)
-{
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *obj;
-       AddressGroup *group;
-       gchar *new_group;
+/**
+ * Copy from tree widget.
+ */
+static void addressbook_treenode_copy_cb( void ) {
+       _clipBoard_->cutFlag = FALSE;
+       addressbook_treenode_to_clipboard();
+       addrclip_clear( _clipBoard_ );
+       addrclip_add( _clipBoard_, _addressSelect_ );
+       /* addrclip_list_show( _clipBoard_, stdout ); */
+}
 
-       if (!addrbook.selected) return;
+/**
+ * Paste clipboard into address tree widget.
+ */
+static void addressbook_treenode_paste_cb( void ) {
+       addressbook_clip_paste_cb();
+}
 
-       obj = gtk_ctree_node_get_row_data(ctree, addrbook.selected);
-       g_return_if_fail(obj != NULL);
-       if (obj->type != ADDR_FOLDER) return;
-
-       new_group = input_dialog(_("New group"),
-                                _("Input the name of new group:"),
-                                 _("NewGroup"));
-       if (!new_group) return;
-       g_strstrip(new_group);
-       if (*new_group == '\0') {
-               g_free(new_group);
-               return;
-       }
+/**
+ * Clear selected entries in clipboard.
+ */
+static void addressbook_list_select_clear( void ) {
+       addrselect_list_clear( _addressSelect_ );
+}
 
-       if (gtk_ctree_find_by_row_data_custom(ctree, addrbook.selected,
-                                             new_group,
-                                             addressbook_obj_name_compare)) {
-               alertpanel_error(_("The name already exists."));
-               g_free(new_group);
-               return;
-       }
+/**
+ * Add specified address item to selected address list.
+ * \param aio Address item object.
+ * \param ds  Datasource.
+ */
+static void addressbook_list_select_add( AddrItemObject *aio, AddressDataSource *ds ) {
+       gchar *cacheID;
 
-       group = g_new(AddressGroup, 1);
-       ADDRESS_OBJECT_TYPE(group) = ADDR_GROUP;
-       group->name = g_strdup(new_group);
-       group->items = NULL;
+       if( ds == NULL ) return;
+       cacheID = addrindex_get_cache_id( _addressIndex_, ds );
+       addrselect_list_add_obj( _addressSelect_, aio, cacheID );
+       g_free( cacheID );
+}
 
-       addressbook_add_object(addrbook.selected, ADDRESS_OBJECT(group));
+/**
+ * Remove specified address item from selected address list.
+ * \param aio Address item object.
+ */
+static void addressbook_list_select_remove( AddrItemObject *aio ) {
+       addrselect_list_remove( _addressSelect_, aio );
+}
 
-       g_free(new_group);
+/**
+ * Invoke EMail compose window with addresses in selected address list.
+ */
+static void addressbook_mail_to_cb( void ) {
+       GList *listAddress;
 
-       if (addrbook.selected == addrbook.opened)
-               addressbook_set_clist(obj);
+       if( ! addrselect_test_empty( _addressSelect_ ) ) {
+               listAddress = addrselect_build_list( _addressSelect_ );
+               compose_new_with_list( NULL, listAddress );
+               mgu_free_dlist( listAddress );
+               listAddress = NULL;
+       }
 }
 
-static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
+static void addressbook_list_row_selected( GtkCTree *clist,
+                                          GtkCTreeNode *node,
+                                          gint column,
+                                          gpointer data )
 {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       gchar *text[1];
-       guint8 spacing;
-       GdkPixmap *pix_cl, *pix_op;
-       GdkBitmap *mask_cl, *mask_op;
-       gboolean is_leaf, expanded;
+       GtkEntry *entry = GTK_ENTRY(addrbook.entry);
+       AddrItemObject *aio = NULL;
+       AddressObject *pobj = NULL;
+       AdapterDSource *ads = NULL;
+       AddressDataSource *ds = NULL;
 
-       gtk_ctree_get_node_info(ctree, node, text, &spacing,
-                               &pix_cl, &mask_cl, &pix_op, &mask_op,
-                               &is_leaf, &expanded);
-       gtk_ctree_set_node_info(ctree, node, name, spacing,
-                               pix_cl, mask_cl, pix_op, mask_op,
-                               is_leaf, expanded);
-}
+       gtk_entry_set_text( entry, "" );
+       addrbook.listSelected = node;
 
-static void addressbook_edit_group(GtkCTreeNode *group_node)
-{
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
-       AddressObject *obj;
-       AddressGroup *group;
-       gchar *new_name;
-       GtkCTreeNode *node;
+       pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       if( pobj == NULL ) return;
 
-       if (!group_node && clist->selection) {
-               obj = gtk_clist_get_row_data(clist,
-                                            GPOINTER_TO_INT(clist->selection->data));
-               g_return_if_fail(obj != NULL);
-               if (obj->type != ADDR_GROUP) return;
-               node = gtk_ctree_find_by_row_data
-                       (ctree, addrbook.selected, obj);
-               if (!node) return;
-       } else {
-               if (group_node)
-                       node = group_node;
-               else
-                       node = addrbook.selected;
-               obj = gtk_ctree_node_get_row_data(ctree, node);
-               g_return_if_fail(obj != NULL);
-               if (obj->type != ADDR_GROUP) return;
-       }
-
-       group = ADDRESS_GROUP(obj);
-
-       new_name = input_dialog(_("Edit group"),
-                               _("Input the new name of group:"),
-                               group->name);
-       if (!new_name) return;
-       g_strstrip(new_name);
-       if (*new_name == '\0') {
-               g_free(new_name);
-               return;
+       if( pobj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(pobj);
+               ds = ads->dataSource;
+       }
+       else if( pobj->type != ADDR_INTERFACE ) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
        }
 
-       if (gtk_ctree_find_by_row_data_custom(ctree, addrbook.selected,
-                                             new_name,
-                                             addressbook_obj_name_compare)) {
-               alertpanel_error(_("The name already exists."));
-               g_free(new_name);
-               return;
+       aio = gtk_ctree_node_get_row_data( clist, node );
+       if( aio ) {
+               /* printf( "list select: %d : '%s'\n", aio->type, aio->name ); */
+               addressbook_list_select_add( aio, ds );
        }
 
-       g_free(group->name);
-       group->name = g_strdup(new_name);
+       addressbook_list_menu_setup();
+}
 
-       addressbook_change_node_name(node, new_name);
-       gtk_ctree_sort_node(ctree, GTK_CTREE_ROW(node)->parent);
+static void addressbook_list_row_unselected( GtkCTree *ctree,
+                                            GtkCTreeNode *node,
+                                            gint column,
+                                            gpointer data )
+{
+       AddrItemObject *aio;
 
-       g_free(new_name);
+       aio = gtk_ctree_node_get_row_data( ctree, node );
+       if( aio != NULL ) {
+               /* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
+               addressbook_list_select_remove( aio );
+       }
+}
+
+/* from gdkevents.c */
+#define DOUBLE_CLICK_TIME 250
+
+static gboolean addressbook_list_button_pressed(GtkWidget *widget,
+                                               GdkEventButton *event,
+                                               gpointer data)
+{
+       static guint32 lasttime = 0;
+       if( ! event ) return FALSE;
+
+       addressbook_list_menu_setup();
+
+       if( event->button == 3 ) {
+               gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
+                      event->button, event->time );
+       } else if (event->button == 1) {
+               if (event->time - lasttime < DOUBLE_CLICK_TIME) {
+                       if (prefs_common.add_address_by_click &&
+                           addrbook.target_compose)
+                               addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
+                       else
+                               addressbook_edit_address_cb(NULL, 0, NULL);
 
-       addrbook.open_folder = TRUE;
-       gtk_ctree_select(ctree, addrbook.opened);
+                       lasttime = 0;
+               } else
+                       lasttime = event->time;
+       }
+
+       return FALSE;
 }
 
-static void addressbook_edit_folder_cb(gpointer data, guint action,
-                                      GtkWidget *widget)
+static gboolean addressbook_list_button_released(GtkWidget *widget,
+                                                GdkEventButton *event,
+                                                gpointer data)
 {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *obj;
-       AddressFolder *folder;
-       gchar *new_name = NULL;
-       GtkCTreeNode *node = NULL, *parentNode = NULL;
+       return FALSE;
+}
 
-       if (!addrbook.selected) return;
-       if (GTK_CTREE_ROW(addrbook.selected)->level == 1) return;
+static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
+                                               GdkEventButton *event,
+                                               gpointer data)
+{
+       GtkCList *clist = GTK_CLIST(ctree);
+       gint row, column;
+       AddressObject *obj = NULL;
+       AdapterDSource *ads = NULL;
+       AddressInterface *iface = NULL;
+       AddressDataSource *ds = NULL;
+       gboolean canEdit = FALSE;
+       gboolean canDelete = FALSE;
+       gboolean canCut = FALSE;
+       gboolean canCopy = FALSE;
+       gboolean canPaste = FALSE;
+       gboolean canTreeCut = FALSE;
+       gboolean canTreeCopy = FALSE;
+       gboolean canTreePaste = FALSE;
+       gboolean canLookup = FALSE;
+
+       if( ! event ) return FALSE;
+       addressbook_menubar_set_sensitive( FALSE );
 
-       obj = gtk_ctree_node_get_row_data(ctree, addrbook.selected);
-       g_return_if_fail(obj != NULL);
-       g_return_if_fail(obj->type == ADDR_FOLDER || obj->type == ADDR_GROUP ||
-                       obj->type == ADDR_VCARD || obj->type == ADDR_JPILOT ||
-                       obj->type == ADDR_CATEGORY || obj->type == ADDR_LDAP );
+       if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
+               gtk_clist_select_row( clist, row, column );
+               
+               gtkut_clist_set_focus_row(clist, row);
+               obj = gtk_clist_get_row_data( clist, row );
+       }
 
-       if (obj->type == ADDR_GROUP) {
-               addressbook_edit_group(addrbook.selected);
-               return;
+       menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
+
+       if( obj == NULL ) return FALSE;
+
+       if( ! addrclip_is_empty( _clipBoard_ ) ) {
+               canTreePaste = TRUE;
        }
 
-       if( obj->type == ADDR_VCARD ) {
-                AddressVCard *vcard = ADDRESS_VCARD(obj);
-                if( addressbook_edit_vcard( vcard ) == NULL ) return;
-               new_name = vcard->name;
-               parentNode = addrbook.vcard;
+       if (obj->type == ADDR_DATASOURCE) {
+               ads = ADAPTER_DSOURCE(obj);
+               ds = ads->dataSource;
+               iface = ds->interface;
+               canEdit = TRUE;
+               canDelete = TRUE;
+               if( iface->readOnly ) {
+                       canTreePaste = FALSE;
+               }
+               else {
+                       menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+               }
+               canTreeCopy = TRUE;
+               if( iface->externalQuery ) canLookup = TRUE;
+       }
+       else if (obj->type == ADDR_ITEM_FOLDER) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               iface = ds->interface;
+               if( iface->readOnly ) {
+                       canTreePaste = FALSE;
+               }
+               else {
+                       canEdit = TRUE;
+                       canDelete = TRUE;
+                       canTreeCut = TRUE;
+                       menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+               }
+               canTreeCopy = TRUE;
+               iface = ds->interface;
+               if( iface->externalQuery ) {
+                       /* Enable deletion of LDAP folder */
+                       canLookup = TRUE;
+                       canDelete = TRUE;
+               }
        }
-#ifdef USE_JPILOT
-       else if( obj->type == ADDR_JPILOT ) {
-                AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               if( ! _have_pilot_library_ ) return;
-                if( addressbook_edit_jpilot( jpilot ) == NULL ) return;
-               new_name = jpilot->name;
-               parentNode = addrbook.jpilot;
+       else if (obj->type == ADDR_ITEM_GROUP) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               iface = ds->interface;
+               if( ! iface->readOnly ) {
+                       canEdit = TRUE;
+                       canDelete = TRUE;
+                       menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+               }
        }
-#endif
-#ifdef USE_LDAP
-       else if( obj->type == ADDR_LDAP ) {
-                AddressLDAP *ldapi = ADDRESS_LDAP(obj);
-               if( ! _have_ldap_library_ ) return;
-                if( addressbook_edit_ldap( ldapi ) == NULL ) return;
-               new_name = ldapi->name;
-               parentNode = addrbook.ldap;
+       else if (obj->type == ADDR_INTERFACE) {
+               canTreePaste = FALSE;
        }
-#endif
 
-       if( new_name && parentNode) {
-               // Update node in tree view
-               node = gtk_ctree_find_by_row_data( ctree, addrbook.selected, obj );
-               if( ! node ) return;
-               addressbook_change_node_name( node, new_name );
-               gtk_ctree_sort_node(ctree, parentNode);
-               addrbook.open_folder = TRUE;
-               gtk_ctree_select( GTK_CTREE(addrbook.ctree), node );
-               return;
+       if( canEdit ) {
+               if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
        }
+       if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
+       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
 
-       folder = ADDRESS_FOLDER(obj);
-       new_name = input_dialog(_("Edit folder"),
-                               _("Input the new name of folder:"),
-                               folder->name);
+       /* Enable edit */
+       menu_set_sensitive( addrbook.tree_factory, "/Edit",   canEdit );
+       menu_set_sensitive( addrbook.tree_factory, "/Delete", canDelete );
+       menu_set_sensitive( addrbook.tree_factory, "/Cut",    canTreeCut );
+       menu_set_sensitive( addrbook.tree_factory, "/Copy",   canTreeCopy );
+       menu_set_sensitive( addrbook.tree_factory, "/Paste",  canTreePaste );
 
-       if (!new_name) return;
-       g_strstrip(new_name);
-       if (*new_name == '\0') {
-               g_free(new_name);
-               return;
-       }
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",          canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book",        canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",           canCut );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",          canCopy );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",         canPaste );
+/*     menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
 
-       if (gtk_ctree_find_by_row_data_custom(ctree, addrbook.selected,
-                                             new_name,
-                                             addressbook_obj_name_compare)) {
-               alertpanel_error(_("The name already exists."));
-               g_free(new_name);
-               return;
+       addressbook_show_buttons(addrbook.target_compose == NULL, canLookup, addrbook.target_compose != NULL);
+       if( event->button == 3 ) {
+               gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
+                              event->button, event->time);
        }
 
-       g_free(folder->name);
-       folder->name = g_strdup(new_name);
-
-       addressbook_change_node_name(addrbook.selected, new_name);
-       gtk_ctree_sort_node(ctree, GTK_CTREE_ROW(addrbook.selected)->parent);
+       return FALSE;
+}
 
-       g_free(new_name);
+static gboolean addressbook_tree_button_released(GtkWidget *ctree,
+                                                GdkEventButton *event,
+                                                gpointer data)
+{
+       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
+       
+       gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
+       return FALSE;
 }
 
-static void addressbook_delete_folder_cb(gpointer data, guint action,
-                                        GtkWidget *widget)
+static void addressbook_new_folder_cb(gpointer data, guint action,
+                                     GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *obj, *pobj;
-       gchar *name;
-       gchar *message;
-       AlertValue aval;
-
-       if (!addrbook.selected) return;
-       if (GTK_CTREE_ROW(addrbook.selected)->level == 1) return;
-
-       obj = gtk_ctree_node_get_row_data(ctree, addrbook.selected);
-       g_return_if_fail(obj != NULL);
+       AddressObject *obj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       ItemFolder *parentFolder = NULL;
+       ItemFolder *folder = NULL;
+
+       if( ! addrbook.treeSelected ) return;
+       obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+       if( obj == NULL ) return;
+       ds = addressbook_find_datasource( addrbook.treeSelected );
+       if( ds == NULL ) return;
 
-       if (obj->type == ADDR_GROUP)
-               name = ADDRESS_GROUP(obj)->name;
-       else if (obj->type == ADDR_FOLDER)
-               name = ADDRESS_FOLDER(obj)->name;
-       else if (obj->type == ADDR_VCARD)
-               name = ADDRESS_VCARD(obj)->name;
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               if( ! _have_pilot_library_ ) return;
-               name = ADDRESS_JPILOT(obj)->name;
+       if( obj->type == ADDR_DATASOURCE ) {
+               if( ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK ) return;
        }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               if( ! _have_ldap_library_ ) return;
-               name = ADDRESS_LDAP(obj)->name;
+       else if( obj->type == ADDR_ITEM_FOLDER ) {
+               parentFolder = ADAPTER_FOLDER(obj)->itemFolder;
        }
-#endif
-       else
+       else {
                return;
+       }
 
-       message = g_strdup_printf(_("Really delete `%s' ?"), name);
-       aval = alertpanel(_("Delete"), message, _("Yes"), _("No"), NULL);
-       g_free(message);
-       if (aval != G_ALERTDEFAULT) return;
-
-       pobj = gtk_ctree_node_get_row_data
-               (ctree, GTK_CTREE_ROW(addrbook.selected)->parent);
-       if (!pobj) return;
-       g_return_if_fail(pobj->type == ADDR_FOLDER);
-       ADDRESS_FOLDER(pobj)->items =
-               g_list_remove(ADDRESS_FOLDER(pobj)->items, obj);
-
-       addressbook_delete_object(obj);
-       addrbook.open_folder = TRUE;
-       gtk_ctree_remove_node(ctree, addrbook.selected);
-       addrbook.open_folder = FALSE;
-}
-
-#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 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_usize(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); 
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(edit_address_delete_event),
-                          cancelled);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(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);
-
-       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
-                          GTK_SIGNAL_FUNC(edit_address_ok), cancelled);
-       gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
-                          GTK_SIGNAL_FUNC(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;
-}
-
-static void edit_address_ok(GtkWidget *widget, gboolean *cancelled)
-{
-       *cancelled = FALSE;
-       gtk_main_quit();
-}
+       abf = ds->rawDataSource;
+       if( abf == NULL ) return;
+       folder = addressbook_edit_folder( abf, parentFolder, NULL );
+       if( folder ) {
+               GtkCTreeNode *nn;
+               nn = addressbook_node_add_folder(
+                       addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
+               gtk_ctree_expand( ctree, addrbook.treeSelected );
+               if( addrbook.treeSelected == addrbook.opened )
+                       addressbook_set_clist(obj);
+       }
 
-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)
+static void addressbook_new_group_cb(gpointer data, guint action,
+                                    GtkWidget *widget)
 {
-       *cancelled = TRUE;
-       gtk_main_quit();
-
-       return TRUE;
-}
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       AddressObject *obj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       ItemFolder *parentFolder = NULL;
+       ItemGroup *group = NULL;
+
+       if( ! addrbook.treeSelected ) return;
+       obj = gtk_ctree_node_get_row_data(ctree, addrbook.treeSelected);
+       if( obj == NULL ) return;
+       ds = addressbook_find_datasource( addrbook.treeSelected );
+       if( ds == NULL ) return;
 
-static void edit_address_key_pressed(GtkWidget *widget, GdkEventKey *event,
-                                    gboolean *cancelled)
-{
-       if (event && event->keyval == GDK_Escape) {
-               *cancelled = TRUE;
-               gtk_main_quit();
+       if( obj->type == ADDR_DATASOURCE ) {
+               if( ADAPTER_DSOURCE(obj)->subType != ADDR_BOOK ) return;
        }
-}
-
-static 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 (item->name)
-                       gtk_entry_set_text(GTK_ENTRY(addredit.name_entry),
-                                          item->name);
-               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);
+       else if( obj->type == ADDR_ITEM_FOLDER ) {
+               parentFolder = ADAPTER_FOLDER(obj)->itemFolder;
        }
-
-       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;
+       else {
+               return;
        }
 
-       g_free(item->name);
-       item->name = 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);
+       abf = ds->rawDataSource;
+       if( abf == NULL ) return;
+       group = addressbook_edit_group( abf, parentFolder, NULL );
+       if( group ) {
+               GtkCTreeNode *nn;
+               nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
+               gtk_ctree_expand( ctree, addrbook.treeSelected );
+               if( addrbook.treeSelected == addrbook.opened )
+                       addressbook_set_clist(obj);
+       }
 
-       return item;
 }
 
-static void addressbook_new_address_cb(gpointer data, guint action,
-                                      GtkWidget *widget)
+static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
 {
-       AddressItem *item;
-
-       item = addressbook_edit_address(NULL);
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       gchar *text[1];
+       guint8 spacing;
+       GdkPixmap *pix_cl, *pix_op;
+       GdkBitmap *mask_cl, *mask_op;
+       gboolean is_leaf, expanded;
 
-       if (item) {
-               addressbook_add_object(addrbook.selected,
-                                      ADDRESS_OBJECT(item));
-               if (addrbook.selected == addrbook.opened) {
-                       addrbook.open_folder = TRUE;
-                       gtk_ctree_select(GTK_CTREE(addrbook.ctree),
-                                        addrbook.opened);
-               }
-       }
+       gtk_ctree_get_node_info(ctree, node, text, &spacing,
+                               &pix_cl, &mask_cl, &pix_op, &mask_op,
+                               &is_leaf, &expanded);
+       gtk_ctree_set_node_info(ctree, node, name, spacing,
+                               pix_cl, mask_cl, pix_op, mask_op,
+                               is_leaf, expanded);
 }
 
-static void addressbook_edit_address_cb(gpointer data, guint action,
-                                       GtkWidget *widget)
-{
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
-       GtkCTree *ctree;
-       AddressObject *obj, *pobj;
-       GtkCTreeNode *node = NULL, *parentNode = NULL;
-       gchar *nodeName;
-
-       if (!clist->selection) {
-               addressbook_edit_folder_cb(NULL, 0, NULL);
-               return;
-       }
-
-       obj = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
-       g_return_if_fail(obj != NULL);
-
-       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.selected);
-
-       if (obj->type == ADDR_ITEM) {
-               AddressItem *item = ADDRESS_ITEM(obj);
+/**
+ * Edit data source.
+ * \param obj  Address object to edit.
+ * \param node Node in tree.
+ * \return New name of data source.
+ */
+static gchar *addressbook_edit_datasource( AddressObject *obj, GtkCTreeNode *node ) {
+       gchar *newName = NULL;
+       AddressDataSource *ds = NULL;
+       AddressInterface *iface = NULL;
+       AdapterDSource *ads = NULL;
 
-               if( pobj ) {
-                       // Prevent edit of readonly items
-                       if(     pobj->type == ADDR_VCARD ||
-                               pobj->type == ADDR_JPILOT ||
-                               pobj->type == ADDR_CATEGORY ||
-                               pobj->type == ADDR_LDAP ) return;
-               }
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return NULL;
+       iface = ds->interface;
+       if( ! iface->haveLibrary ) return NULL;
 
-               if (addressbook_edit_address(item) == NULL) return;
+       /* Read data from data source */
+       if( addrindex_ds_get_modify_flag( ds ) ) {
+               addrindex_ds_read_data( ds );
+       }
 
-               addrbook.open_folder = TRUE;
-               gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
-               return;
+       if( ! addrindex_ds_get_read_flag( ds ) ) {
+               addrindex_ds_read_data( ds );
        }
-       else if (obj->type == ADDR_GROUP) {
-               addressbook_edit_group(NULL);
-               return;
+
+       /* Handle edit */
+       ads = ADAPTER_DSOURCE(obj);
+       if( ads->subType == ADDR_BOOK ) {
+                if( addressbook_edit_book( _addressIndex_, ads ) == NULL ) return NULL;
        }
-       else if( obj->type == ADDR_VCARD ) {
-               AddressVCard *vcard = ADDRESS_VCARD(obj);
-               if( addressbook_edit_vcard( vcard ) == NULL ) return;
-               nodeName = vcard->name;
-               parentNode = addrbook.vcard;
+       else if( ads->subType == ADDR_VCARD ) {
+                       if( addressbook_edit_vcard( _addressIndex_, ads ) == NULL ) return NULL;
        }
 #ifdef USE_JPILOT
-       else if( obj->type == ADDR_JPILOT ) {
-               AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               if( addressbook_edit_jpilot( jpilot ) == NULL ) return;
-               nodeName = jpilot->name;
-               parentNode = addrbook.jpilot;
+       else if( ads->subType == ADDR_JPILOT ) {
+                if( addressbook_edit_jpilot( _addressIndex_, ads ) == NULL ) return NULL;
        }
 #endif
 #ifdef USE_LDAP
-               else if( obj->type == ADDR_LDAP ) {
-               AddressLDAP *ldapi = ADDRESS_LDAP(obj);
-               if( addressbook_edit_ldap( ldapi ) == NULL ) return;
-               nodeName = ldapi->name;
-               parentNode = addrbook.ldap;
+       else if( ads->subType == ADDR_LDAP ) {
+               if( addressbook_edit_ldap( _addressIndex_, ads ) == NULL ) return NULL;
        }
 #endif
        else {
-               return;
+               return NULL;
        }
-
-       // Update tree node with node name
-               ctree = GTK_CTREE( addrbook.ctree );
-       node = gtk_ctree_find_by_row_data( ctree, addrbook.selected, obj );
-       if( ! node ) return;
-       addressbook_change_node_name( node, nodeName );
-       gtk_ctree_sort_node(ctree, parentNode );
-       addrbook.open_folder = TRUE;
-       gtk_ctree_select( ctree, addrbook.opened );
+       newName = obj->name;
+       return newName;
 }
 
-static void addressbook_delete_address_cb(gpointer data, guint action,
-                                         GtkWidget *widget)
+/*
+* Edit an object that is in the address tree area.
+*/
+static void addressbook_treenode_edit_cb(gpointer data, guint action,
+                                      GtkWidget *widget)
 {
-       addressbook_del_clicked(NULL, NULL);
-}
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       AddressObject *obj;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       GtkCTreeNode *node = NULL, *parentNode = NULL;
+       gchar *name = NULL;
 
-static void close_cb(gpointer data, guint action, GtkWidget *widget)
-{
-       addressbook_close();
-}
+       if( ! addrbook.treeSelected ) return;
+       node = addrbook.treeSelected;
+       if( GTK_CTREE_ROW(node)->level == 1 ) return;
+       obj = gtk_ctree_node_get_row_data( ctree, node );
+       if( obj == NULL ) return;
+       parentNode = GTK_CTREE_ROW(node)->parent;
 
-static void addressbook_set_clist(AddressObject *obj)
-{
-       GtkCList *clist = GTK_CLIST(addrbook.clist);
-       GList *items;
-       gchar *text[N_COLS];
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
 
-       if (!obj) {
-               gtk_clist_clear(clist);
-               return;
+       if( obj->type == ADDR_DATASOURCE ) {
+               name = addressbook_edit_datasource( obj, node );
+               if( name == NULL ) return;
+       }
+       else {
+               abf = ds->rawDataSource;
+               if( abf == NULL ) return;
+               if( obj->type == ADDR_ITEM_FOLDER ) {
+                       AdapterFolder *adapter = ADAPTER_FOLDER(obj);
+                       ItemFolder *item = adapter->itemFolder;
+                       ItemFolder *parentFolder = NULL;
+                       parentFolder = ( ItemFolder * ) ADDRITEM_PARENT(item);
+                       if( addressbook_edit_folder( abf, parentFolder, item ) == NULL ) return;
+                       name = ADDRITEM_NAME(item);
+               }
+               else if( obj->type == ADDR_ITEM_GROUP ) {
+                       AdapterGroup *adapter = ADAPTER_GROUP(obj);
+                       ItemGroup *item = adapter->itemGroup;
+                       ItemFolder *parentFolder = NULL;
+                       parentFolder = ( ItemFolder * ) ADDRITEM_PARENT(item);
+                       if( addressbook_edit_group( abf, parentFolder, item ) == NULL ) return;
+                       name = ADDRITEM_NAME(item);
+               }
+       }
+       if( name && parentNode ) {
+               /* Update node in tree view */
+               addressbook_change_node_name( node, name );
+               gtk_sctree_sort_node(ctree, parentNode);
+               gtk_ctree_expand( ctree, node );
+               gtk_sctree_select( GTK_SCTREE( ctree), node );
        }
+}
 
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
+typedef enum {
+       ADDRTREE_DEL_NONE,
+       ADDRTREE_DEL_DATA,
+       ADDRTREE_DEL_FOLDER_ONLY,
+       ADDRTREE_DEL_FOLDER_ADDR
+} TreeItemDelType ;
+
+/**
+ * Delete an item from the tree widget.
+ * \param data   Data passed in.
+ * \param action Action.
+ * \param widget Widget issuing callback.
+ */
+static void addressbook_treenode_delete_cb(
+               gpointer data, guint action, GtkWidget *widget )
+{
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       GtkCTreeNode *node = NULL;
+       AddressObject *obj;
+       gchar *message;
+       AlertValue aval;
+       AddrBookBase *adbase;
+       AddressCache *cache;
+       AdapterDSource *ads = NULL;
+       AddressInterface *iface = NULL;
+       AddressDataSource *ds = NULL;
+       gboolean remFlag = FALSE;
+       TreeItemDelType delType;
+
+       if( ! addrbook.treeSelected ) return;
+       node = addrbook.treeSelected;
+       if( GTK_CTREE_ROW(node)->level == 1 ) return;
+
+       obj = gtk_ctree_node_get_row_data( ctree, node );
+       g_return_if_fail(obj != NULL);
 
-       if (obj->type == ADDR_GROUP)
-               items = ADDRESS_GROUP(obj)->items;
-       else if (obj->type == ADDR_FOLDER) {
-               items = ADDRESS_FOLDER(obj)->items;
+       if( obj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(obj);
+               if( ads == NULL ) return;
+               ds = ads->dataSource;
+               if( ds == NULL ) return;
        }
-       else if (obj->type == ADDR_VCARD) {
-               items = ADDRESS_VCARD(obj)->items;
+       else {
+               /* Must be folder or something else */
+               ds = addressbook_find_datasource( node );
+               if( ds == NULL ) return;
+
+               /* Only allow deletion from non-readOnly */
+               iface = ds->interface;
+               if( iface->readOnly ) {
+                       /* Allow deletion of query results */
+                       if( ! iface->externalQuery ) return;
+               }
        }
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               items = ADDRESS_JPILOT(obj)->items;
+
+       /* Confirm deletion */
+       delType = ADDRTREE_DEL_NONE;
+       if( obj->type == ADDR_ITEM_FOLDER ) {
+               if( iface->externalQuery ) {
+                       message = g_strdup_printf( _(
+                               "Do you want to delete the query " \
+                               "results and addresses in '%s' ?" ),
+                               obj->name );
+                       aval = alertpanel( _("Delete"), message,
+                               GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+                       g_free(message);
+                       if( aval == G_ALERTDEFAULT ) {
+                               delType = ADDRTREE_DEL_FOLDER_ADDR;
+                       }
+               }
+               else {
+                       message = g_strdup_printf
+                               ( _( "Do you want to delete the folder AND all addresses in '%s' ?\n"
+                                    "If deleting the folder only, addresses will be moved into parent folder." ),
+                                obj->name );
+                       aval = alertpanel( _("Delete folder"), message,
+                               _("_Folder only"), _("Folder and _addresses"),
+                               GTK_STOCK_CANCEL );
+                       g_free(message);
+                       if( aval == G_ALERTDEFAULT ) {
+                               delType = ADDRTREE_DEL_FOLDER_ONLY;
+                       }
+                       else if( aval == G_ALERTALTERNATE ) {
+                               delType = ADDRTREE_DEL_FOLDER_ADDR;
+                       }
+               }
        }
-       else if (obj->type == ADDR_CATEGORY) {
-               items = ADDRESS_CATEGORY(obj)->items;
+       else {
+               message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+               g_free(message);
+               if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
        }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               items = ADDRESS_LDAP(obj)->items;
+       if( delType == ADDRTREE_DEL_NONE ) return;
+
+       /* Proceed with deletion */
+       if( obj->type == ADDR_DATASOURCE ) {
+               /* Remove node from tree */
+               gtk_ctree_remove_node( ctree, node );
+       
+               /* Remove data source. */
+               if( addrindex_index_remove_datasource( _addressIndex_, ds ) ) {
+                       addrindex_free_datasource( ds );
+               }
+               return;
        }
-#endif
-       else {
-               gtk_clist_thaw(clist);
+
+       /* Get reference to cache */
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       if( adbase == NULL ) return;
+       cache = adbase->addressCache;
+
+       /* Remove query results folder */
+       if( iface->externalQuery ) {
+               AdapterFolder *adapter = ADAPTER_FOLDER(obj);
+               ItemFolder *folder = adapter->itemFolder;
+
+               adapter->itemFolder = NULL;
+               /*
+               printf( "remove folder for ::%s::\n", obj->name );
+               printf( "      folder name ::%s::\n", ADDRITEM_NAME(folder) );
+               printf( "-------------- remove results\n" );
+               */
+               addrindex_remove_results( ds, folder );
+               /* printf( "-------------- remove node\n" ); */
+               gtk_ctree_remove_node( ctree, node );
                return;
        }
 
-       for (; items != NULL; items = items->next) {
-               AddressObject *iobj;
-               gint row;
-               iobj = ADDRESS_OBJECT(items->data);
-               if( iobj == NULL ) continue;
-
-               if (iobj->type == ADDR_GROUP) {
-                       AddressGroup *group;
-
-                       group = ADDRESS_GROUP(iobj);
-                       text[COL_NAME]    = group->name;
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_pixtext(clist, row, COL_NAME,
-                                             group->name, 4,
-                                             groupxpm, groupxpmmask);
-                       gtk_clist_set_row_data(clist, row, iobj);
-               } if (iobj->type == ADDR_VCARD) {
-                       AddressVCard *vcard;
-
-                       vcard = ADDRESS_VCARD(iobj);
-                       text[COL_NAME]    = vcard->name;
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_pixtext(clist, row, COL_NAME,
-                                             vcard->name, 4,
-                                             vcardxpm, vcardxpmmask);
-                       gtk_clist_set_row_data(clist, row, iobj);
-#ifdef USE_JPILOT
-               } if (iobj->type == ADDR_JPILOT) {
-                       AddressJPilot *jpilot;
-
-                       jpilot = ADDRESS_JPILOT(iobj);
-                       text[COL_NAME]    = jpilot->name;
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_pixtext(clist, row, COL_NAME,
-                                             jpilot->name, 4,
-                                             jpilotxpm, jpilotxpmmask);
-                       gtk_clist_set_row_data(clist, row, iobj);
-               } if (iobj->type == ADDR_CATEGORY) {
-                       AddressCategory *category;
-
-                       category = ADDRESS_CATEGORY(iobj);
-                       text[COL_NAME]    = category->name;
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_pixtext(clist, row, COL_NAME,
-                                             category->name, 4,
-                                             categoryxpm, categoryxpmmask);
-                       gtk_clist_set_row_data(clist, row, iobj);
-#endif
-#ifdef USE_LDAP
-               } if (iobj->type == ADDR_LDAP) {
-                       AddressLDAP *ldapi;
-
-                       ldapi = ADDRESS_LDAP(iobj);
-                       text[COL_NAME]    = ldapi->name;
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_pixtext(clist, row, COL_NAME,
-                                             ldapi->name, 4,
-                                             ldapxpm, ldapxpmmask);
-                       gtk_clist_set_row_data(clist, row, iobj);
-#endif
-               } else if (iobj->type == ADDR_ITEM) {
-                       AddressItem *item;
+       /* Code below is valid for regular address book deletion */
+       if( obj->type == ADDR_ITEM_FOLDER ) {
+               AdapterFolder *adapter = ADAPTER_FOLDER(obj);
+               ItemFolder *item = adapter->itemFolder;
 
-                       item = ADDRESS_ITEM(iobj);
-                       text[COL_NAME]    = item->name;
-                       text[COL_ADDRESS] = item->address;
-                       text[COL_REMARKS] = item->remarks;
-                       row = gtk_clist_append(clist, text);
-                       gtk_clist_set_row_data(clist, row, iobj);
+               if( delType == ADDRTREE_DEL_FOLDER_ONLY ) {
+                       /* Remove folder only */
+                       item = addrcache_remove_folder( cache, item );
+                       if( item ) {
+                               addritem_free_item_folder( item );
+                               addressbook_move_nodes_up( ctree, node );
+                               remFlag = TRUE;
+                       }
+               }
+               else if( delType == ADDRTREE_DEL_FOLDER_ADDR ) {
+                       /* Remove folder and addresses */
+                       item = addrcache_remove_folder_delete( cache, item );
+                       if( item ) {
+                               addritem_free_item_folder( item );
+                               remFlag = TRUE;
+                       }
                }
        }
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               AdapterGroup *adapter = ADAPTER_GROUP(obj);
+               ItemGroup *item = adapter->itemGroup;
 
-       gtk_clist_sort(clist);
-       gtk_clist_thaw(clist);
+               item = addrcache_remove_group( cache, item );
+               if( item ) {
+                       addritem_free_item_group( item );
+                       remFlag = TRUE;
+               }
+       }
+
+       if( remFlag ) {
+               /* Remove node. */
+               gtk_ctree_remove_node(ctree, node );
+       }
 }
 
-static void addressbook_read_file(void)
-{
-       XMLFile *file;
-       gchar *path;
-
-       debug_print(_("Reading addressbook file..."));
-
-       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ADDRESS_BOOK, NULL);
-       if ((file = xml_open_file(path)) == NULL) {
-               debug_print(_("%s doesn't exist.\n"), path);
-               g_free(path);
-               addressbook_get_tree(NULL, addrbook.common, ADDRESS_TAG_COMMON);
-               addressbook_get_tree(NULL, addrbook.personal, ADDRESS_TAG_PERSONAL);
-               addressbook_get_tree(NULL, addrbook.vcard, ADDRESS_TAG_VCARD);
-#ifdef USE_JPILOT
-               addressbook_get_tree(NULL, addrbook.jpilot, ADDRESS_TAG_JPILOT);
-#endif
-#ifdef USE_LDAP
-               addressbook_get_tree(NULL, addrbook.ldap, ADDRESS_TAG_LDAP);
-#endif
-               return;
+static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AddressObject *pobj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+
+       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+       if( pobj == NULL ) return;
+       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+       if( ds == NULL ) return;
+
+       abf = ds->rawDataSource;
+       if( abf == NULL ) return;
+
+       if( pobj->type == ADDR_DATASOURCE ) {
+               if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
+                       /* New address */
+                       ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
+                       if( person && addrbook.treeSelected == addrbook.opened ) {
+                               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+                               addressbook_folder_refresh_one_person(
+                                       GTK_CTREE(addrbook.clist), person );
+                       }
+               }
+       }
+       else if( pobj->type == ADDR_ITEM_FOLDER ) {
+               /* New address */
+               ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
+               ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
+               if( person ) {
+                       if (addrbook.treeSelected == addrbook.opened) {
+                               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+                       }
+               }
        }
-       g_free(path);
+       else if( pobj->type == ADDR_ITEM_GROUP ) {
+               /* New address in group */
+               ItemGroup *group = ADAPTER_GROUP(pobj)->itemGroup;
+               if( addressbook_edit_group( abf, NULL, group ) == NULL ) return;
+               if (addrbook.treeSelected == addrbook.opened) {
+                       /* Change node name in tree. */
+                       addressbook_change_node_name( addrbook.treeSelected, ADDRITEM_NAME(group) );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+               }
+       }
+}
 
-       xml_get_dtd(file);
+/**
+ * Search for specified child group node in address index tree.
+ * \param parent Parent node.
+ * \param group  Group to find.
+ */
+static GtkCTreeNode *addressbook_find_group_node( GtkCTreeNode *parent, ItemGroup *group ) {
+       GtkCTreeNode *node = NULL;
+       GtkCTreeRow *currRow;
 
-       if (xml_parse_next_tag(file) < 0 ||
-           xml_compare_tag(file, "addressbook") == FALSE) {
-               g_warning("Invalid addressbook data\n");
-               xml_close_file(file);
-               return;
-       }
+       currRow = GTK_CTREE_ROW( parent );
+       if( currRow ) {
+               node = currRow->children;
+               while( node ) {
+                       AddressObject *obj;
 
-       addressbook_get_tree(file, addrbook.common, ADDRESS_TAG_COMMON);
-       addressbook_get_tree(file, addrbook.personal, ADDRESS_TAG_PERSONAL);
-       addressbook_get_tree(file, addrbook.vcard, ADDRESS_TAG_VCARD);
-#ifdef USE_JPILOT
-       addressbook_get_tree(file, addrbook.jpilot, ADDRESS_TAG_JPILOT);
-#endif
-#ifdef USE_LDAP
-       addressbook_get_tree(file, addrbook.ldap, ADDRESS_TAG_LDAP);
-#endif
+                       obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
+                       if( obj->type == ADDR_ITEM_GROUP ) {
+                               ItemGroup *g = ADAPTER_GROUP(obj)->itemGroup;
+                               if( g == group ) return node;
+                       }
+                       currRow = GTK_CTREE_ROW(node);
+                       node = currRow->sibling;
+               }
+       }
+       return NULL;
+}
 
-       xml_close_file(file);
+static AddressBookFile *addressbook_get_book_file() {
+       AddressBookFile *abf = NULL;
+       AddressDataSource *ds = NULL;
 
-       debug_print(_("done.\n"));
+       ds = addressbook_find_datasource( addrbook.treeSelected );
+       if( ds == NULL ) return NULL;
+       if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+       return abf;
 }
 
-static void addressbook_get_tree(XMLFile *file, GtkCTreeNode *node,
-                                const gchar *folder_tag)
-{
-       AddressFolder *folder;
+static AddressBookFile *addressbook_get_book_file_for_node(GtkCTreeNode *node) {
+       AddressBookFile *abf = NULL;
+       AddressDataSource *ds = NULL;
 
-       g_return_if_fail(node != NULL);
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return NULL;
+       if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+       return abf;
+}
 
-       folder = g_new(AddressFolder, 1);
-       ADDRESS_OBJECT(folder)->type = ADDR_FOLDER;
-       folder->name = g_strdup(folder_tag);
-       folder->items = NULL;
-       gtk_ctree_node_set_row_data(GTK_CTREE(addrbook.ctree), node, folder);
+static void addressbook_tree_remove_children( GtkCTree *ctree, GtkCTreeNode *parent ) {
+       GtkCTreeNode *node;
+       GtkCTreeRow *row;
 
-       if (file) {
-               if (xml_parse_next_tag(file) < 0 ||
-                   xml_compare_tag(file, folder_tag) == FALSE) {
-                       g_warning("Invalid addressbook data\n");
-                       return;
+       /* Remove existing folders and groups */
+       row = GTK_CTREE_ROW( parent );
+       if( row ) {
+               while( (node = row->children) ) {
+                       gtk_ctree_remove_node( ctree, node );
                }
        }
-
-       if (file) addressbook_add_objs(file, node);
 }
 
-static void addressbook_add_objs(XMLFile *file, GtkCTreeNode *node)
-{
-       GList *attr;
-       guint prev_level;
-       GtkCTreeNode *new_node;
-
-       for (;;) {
-               prev_level = file->level;
-               if (xml_parse_next_tag(file) < 0) return;
-               if (file->level < prev_level) return;
-
-               if (xml_compare_tag(file, "group")) {
-                       AddressGroup *group;
-
-                       group = g_new(AddressGroup, 1);
-                       ADDRESS_OBJECT_TYPE(group) = ADDR_GROUP;
-                       attr = xml_get_current_tag_attr(file);
-                       if (attr)
-                               group->name = g_strdup(((XMLAttr *)attr->data)->value);
-                       else
-                               group->name = NULL;
-                       group->items = NULL;
+static void addressbook_move_nodes_up( GtkCTree *ctree, GtkCTreeNode *node ) {
+       GtkCTreeNode *parent, *child;
+       GtkCTreeRow *currRow;
+       currRow = GTK_CTREE_ROW( node );
+       if( currRow ) {
+               parent = currRow->parent;
+               while( (child = currRow->children) ) {
+                       gtk_ctree_move( ctree, child, parent, node );
+               }
+               gtk_sctree_sort_node( ctree, parent );
+       }
+}
 
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(group));
+static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+       GtkCTree *clist = GTK_CTREE(addrbook.clist);
+       GtkCTree *ctree;
+       AddressObject *obj = NULL, *pobj = NULL;
+       AddressDataSource *ds = NULL;
+       GtkCTreeNode *node = NULL, *parentNode = NULL;
+       gchar *name = NULL;
+       AddressBookFile *abf = NULL;
 
-                       addressbook_add_objs(file, new_node);
-               } else if (xml_compare_tag(file, "folder")) {
-                       AddressFolder *folder;
+       if( addrbook.listSelected == NULL ) return;
+       obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+       g_return_if_fail(obj != NULL);
 
-                       folder = g_new(AddressFolder, 1);
-                       ADDRESS_OBJECT_TYPE(folder) = ADDR_FOLDER;
-                       attr = xml_get_current_tag_attr(file);
-                       if (attr)
-                               folder->name = g_strdup(((XMLAttr *)attr->data)->value);
-                       else
-                               folder->name = NULL;
-                       folder->items = NULL;
+               ctree = GTK_CTREE( addrbook.ctree );
+       pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+       node = gtk_ctree_find_by_row_data( ctree, addrbook.treeSelected, obj );
 
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(folder));
+       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+       if( ds == NULL ) return;
 
-                       addressbook_add_objs(file, new_node);
-               }
-               else if( xml_compare_tag( file, "vcard" ) ) {
-                       AddressVCard *vcard;
-                       vcard = addressbook_parse_vcard( file );
-                       if( ! vcard ) return;
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(vcard));
-               }
-#ifdef USE_JPILOT
-               else if( xml_compare_tag( file, "jpilot" ) ) {
-                       AddressJPilot *jpilot;
-                       jpilot = addressbook_parse_jpilot( file );
-                       if( ! jpilot ) return;
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(jpilot));
-               }
-#endif
-#ifdef USE_LDAP
-               else if( xml_compare_tag( file, "server" ) ) {
-                       AddressLDAP *ldapi;
-                       ldapi = addressbook_parse_ldap( file );
-                       if( ! ldapi ) return;
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(ldapi));
+       abf = addressbook_get_book_file();
+       
+       if( obj->type == ADDR_ITEM_EMAIL ) {
+               ItemEMail *email = ( ItemEMail * ) obj;
+               if( email == NULL ) return;
+               if( pobj && pobj->type == ADDR_ITEM_GROUP ) {
+                       /* Edit parent group */
+                       AdapterGroup *adapter = ADAPTER_GROUP(pobj);
+                       ItemGroup *itemGrp = adapter->itemGroup;
+                       if( abf == NULL ) return;
+                       if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
+                       name = ADDRITEM_NAME(itemGrp);
+                       node = addrbook.treeSelected;
+                       parentNode = GTK_CTREE_ROW(node)->parent;
                }
-#endif
-               else if (xml_compare_tag(file, "item")) {
-                       AddressItem *item;
-
-                       item = addressbook_parse_item(file);
-                       if (!item) return;
-                       new_node = addressbook_add_object
-                               (node, ADDRESS_OBJECT(item));
-               } else {
-                       g_warning("Invalid tag\n");
+               else {
+                       /* Edit person - email page */
+                       ItemPerson *person;
+                       person = ( ItemPerson * ) ADDRITEM_PARENT(email);
+                       if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
+                       addressbook_folder_refresh_one_person( clist, person );
+                       invalidate_address_completion();
                        return;
                }
        }
+       else if( obj->type == ADDR_ITEM_PERSON ) {
+               /* Edit person - basic page */
+               ItemPerson *person = ( ItemPerson * ) obj;
+               if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
+               invalidate_address_completion();
+               addressbook_folder_refresh_one_person( clist, person );
+               return;
+       }
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               ItemGroup *itemGrp = ( ItemGroup * ) obj;
+               if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
+               parentNode = addrbook.treeSelected;
+               node = addressbook_find_group_node( parentNode, itemGrp );
+               name = ADDRITEM_NAME(itemGrp);
+       }
+       else {
+               return;
+       }
+
+       /* Update tree node with node name */
+       if( node == NULL ) return;
+       addressbook_change_node_name( node, name );
+       gtk_sctree_sort_node( ctree, parentNode );
+       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened ); 
 }
 
-static GtkCTreeNode *addressbook_add_object(GtkCTreeNode *node,
-                                           AddressObject *obj)
+static void addressbook_delete_address_cb(gpointer data, guint action,
+                                         GtkWidget *widget)
 {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       GtkCTreeNode *added;
-       AddressObject *pobj;
+       addressbook_del_clicked(NULL, NULL);
+}
 
-       g_return_val_if_fail(node != NULL, NULL);
-       g_return_val_if_fail(obj  != NULL, NULL);
+static void close_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       addressbook_close();
+}
 
-       pobj = gtk_ctree_node_get_row_data(ctree, node);
-       g_return_val_if_fail(pobj != NULL, NULL);
+static void addressbook_file_save_cb( gpointer data, guint action, GtkWidget *widget ) {
+       addressbook_export_to_file();
+}
 
-       if (pobj->type == ADDR_ITEM) {
-               g_warning("Parent object mustn't be an item.\n");
-               return NULL;
+static void addressbook_person_expand_node( GtkCTree *ctree, GList *node, gpointer *data ) {
+       if( node ) {
+               ItemPerson *person = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(node) );
+               if( person ) addritem_person_set_opened( person, TRUE );
        }
-       if (pobj->type == ADDR_FOLDER &&
-           (obj->type == ADDR_GROUP || obj->type == ADDR_FOLDER))
-               gtk_ctree_expand(ctree, node);
-
-       if (pobj->type == ADDR_FOLDER && obj->type == ADDR_VCARD )
-               gtk_ctree_expand(ctree, node);
-
-       if (pobj->type == ADDR_FOLDER && obj->type == ADDR_JPILOT )
-               gtk_ctree_expand(ctree, node);
-
-       if (pobj->type == ADDR_FOLDER && obj->type == ADDR_LDAP )
-               gtk_ctree_expand(ctree, node);
+}
 
-       if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
+static void addressbook_person_collapse_node( GtkCTree *ctree, GList *node, gpointer *data ) {
+       if( node ) {
+               ItemPerson *person = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(node) );
+               if( person ) addritem_person_set_opened( person, FALSE );
+       }
+}
 
-               if (pobj->type != ADDR_FOLDER) {
-                       g_warning("Group can't be added in another group.\n");
-                       return NULL;
+static gchar *addressbook_format_item_clist( ItemPerson *person, ItemEMail *email ) {
+       gchar *str = NULL;
+       gchar *eMailAlias = ADDRITEM_NAME(email);
+       if( eMailAlias && *eMailAlias != '\0' ) {
+               if( person ) {
+                       str = g_strdup_printf( "%s - %s", ADDRITEM_NAME(person), eMailAlias );
                }
-
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &group->name, FOLDER_SPACING,
-                                             groupxpm, groupxpmmask,
-                                             groupxpm, groupxpmmask,
-                                             TRUE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
-       } else if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
-
-               if (pobj->type != ADDR_FOLDER) {
-                       g_warning("Group can't contain folder.\n");
-                       return NULL;
+               else {
+                       str = g_strdup( eMailAlias );
                }
-
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &folder->name, FOLDER_SPACING,
-                                             folderxpm, folderxpmmask,
-                                             folderopenxpm, folderopenxpmmask,
-                                             FALSE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
-
-       }
-       else if (obj->type == ADDR_VCARD) {
-               AddressVCard *vcard = ADDRESS_VCARD(obj);
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &vcard->name, FOLDER_SPACING,
-                                             vcardxpm, vcardxpmmask,
-                                             vcardxpm, vcardxpmmask,
-                                             TRUE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
-       }
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &jpilot->name, FOLDER_SPACING,
-                                             jpilotxpm, jpilotxpmmask,
-                                             jpilotxpm, jpilotxpmmask,
-                                             FALSE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
-       }
-       else if (obj->type == ADDR_CATEGORY) {
-               AddressCategory *category = ADDRESS_CATEGORY(obj);
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &category->name, FOLDER_SPACING,
-                                             categoryxpm, categoryxpmmask,
-                                             categoryxpm, categoryxpmmask,
-                                             TRUE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
-       }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               AddressLDAP *server = ADDRESS_LDAP(obj);
-               added = gtk_ctree_insert_node(ctree, node, NULL,
-                                             &server->name, FOLDER_SPACING,
-                                             ldapxpm, ldapxpmmask,
-                                             ldapxpm, ldapxpmmask,
-                                             TRUE, FALSE);
-               gtk_ctree_node_set_row_data(ctree, added, obj);
        }
-#endif
-               else {
-               added = node;
+       return str;
+}
+
+static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
+       GList *items = itemGroup->listEMail;
+       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+       for( ; items != NULL; items = g_list_next( items ) ) {
+               GtkCTreeNode *nodeEMail = NULL;
+               gchar *text[N_LIST_COLS];
+               ItemEMail *email = items->data;
+               ItemPerson *person;
+               gchar *str = NULL;
+
+               if( ! email ) continue;
+
+               person = ( ItemPerson * ) ADDRITEM_PARENT(email);
+               str = addressbook_format_item_clist( person, email );
+               if( str ) {
+                       text[COL_NAME] = str;
+               }
+               else {
+                       text[COL_NAME] = ADDRITEM_NAME(person);
+               }
+               text[COL_ADDRESS] = email->address;
+               text[COL_REMARKS] = email->remarks;
+               nodeEMail = gtk_ctree_insert_node(
+                               clist, NULL, NULL,
+                               text, FOLDER_SPACING,
+                               atci->iconXpm, atci->maskXpm,
+                               atci->iconXpmOpen, atci->maskXpmOpen,
+                               FALSE, FALSE );
+               gtk_ctree_node_set_row_data( clist, nodeEMail, email );
+               g_free( str );
+               str = NULL;
        }
+}
 
-       if (obj->type == ADDR_GROUP || obj->type == ADDR_ITEM) {
-               if (pobj->type == ADDR_GROUP) {
-                       AddressGroup *group = ADDRESS_GROUP(pobj);
+static void addressbook_folder_load_one_person(
+               GtkCTree *clist, ItemPerson *person,
+               AddressTypeControlItem *atci,
+               AddressTypeControlItem *atciMail )
+{
+       GtkCTreeNode *nodePerson = NULL;
+       GtkCTreeNode *nodeEMail = NULL;
+       gchar *text[N_LIST_COLS];
+       gboolean flgFirst = TRUE, haveAddr = FALSE;
+       GList *node;
+
+       if( person == NULL ) return;
+
+       text[COL_NAME] = NULL;
+       node = person->listEMail;
+       while( node ) {
+               ItemEMail *email = node->data;
+               gchar *eMailAddr = NULL;
+               node = g_list_next( node );
+
+               text[COL_ADDRESS] = email->address;
+               text[COL_REMARKS] = email->remarks;
+               eMailAddr = ADDRITEM_NAME(email);
+               if( eMailAddr && *eMailAddr == '\0' ) eMailAddr = NULL;
+               if( flgFirst ) {
+                       /* First email belongs with person */
+                       gchar *str = addressbook_format_item_clist( person, email );
+                       if( str ) {
+                               text[COL_NAME] = str;
+                       }
+                       else {
+                               text[COL_NAME] = ADDRITEM_NAME(person);
+                       }
+                       nodePerson = gtk_ctree_insert_node(
+                                       clist, NULL, NULL,
+                                       text, FOLDER_SPACING,
+                                       atci->iconXpm, atci->maskXpm,
+                                       atci->iconXpmOpen, atci->maskXpmOpen,
+                                       FALSE, person->isOpened );
+                       g_free( str );
+                       str = NULL;
+                       gtk_ctree_node_set_row_data(clist, nodePerson, person );
+               }
+               else {
+                       /* Subsequent email is a child node of person */
+                       text[COL_NAME] = ADDRITEM_NAME(email);
+                       nodeEMail = gtk_ctree_insert_node(
+                                       clist, nodePerson, NULL,
+                                       text, FOLDER_SPACING,
+                                       atciMail->iconXpm, atciMail->maskXpm,
+                                       atciMail->iconXpmOpen, atciMail->maskXpmOpen,
+                                       FALSE, TRUE );
+                       gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+               }
+               flgFirst = FALSE;
+               haveAddr = TRUE;
+       }
+       if( ! haveAddr ) {
+               /* Have name without EMail */
+               text[COL_NAME] = ADDRITEM_NAME(person);
+               text[COL_ADDRESS] = NULL;
+               text[COL_REMARKS] = NULL;
+               nodePerson = gtk_ctree_insert_node(
+                               clist, NULL, NULL,
+                               text, FOLDER_SPACING,
+                               atci->iconXpm, atci->maskXpm,
+                               atci->iconXpmOpen, atci->maskXpmOpen,
+                               FALSE, person->isOpened );
+               gtk_ctree_node_set_row_data(clist, nodePerson, person );
+       }
+       return;
+}
 
-                       group->items = g_list_append(group->items, obj);
-               } else if (pobj->type == ADDR_FOLDER) {
-                       AddressFolder *folder = ADDRESS_FOLDER(pobj);
+static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
+       GList *items;
+       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+       AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
 
-                       folder->items = g_list_append(folder->items, obj);
-               }
-       }
+       if( atci == NULL ) return;
+       if( atciMail == NULL ) return;
 
-       if (pobj->type == ADDR_FOLDER) {
-               if (obj->type == ADDR_VCARD || obj->type == ADDR_JPILOT || obj->type == ADDR_LDAP) {
-                       AddressFolder *folder = ADDRESS_FOLDER(pobj);
-                       folder->items = g_list_append(folder->items, obj);
-               }
+       /* Load email addresses */
+       items = addritem_folder_get_person_list( itemFolder );
+       for( ; items != NULL; items = g_list_next( items ) ) {
+               addressbook_folder_load_one_person( clist, items->data, atci, atciMail );
        }
+       /* Free up the list */
+       mgu_clear_list( items );
+       g_list_free( items );
+}
 
-       gtk_ctree_sort_node(ctree, node);
-
-       return added;
+static void addressbook_folder_remove_node( GtkCTree *clist, GtkCTreeNode *node ) { 
+       addrbook.listSelected = NULL;
+       gtk_ctree_remove_node( clist, node );
+       addressbook_menubar_set_sensitive( FALSE );
+       addressbook_menuitem_set_sensitive(
+               gtk_ctree_node_get_row_data(
+                       GTK_CTREE(clist), addrbook.treeSelected ),
+               addrbook.treeSelected );
 }
 
-static void addressbook_delete_object(AddressObject *obj)
-{
-       if (!obj) return;
-
-       if (obj->type == ADDR_ITEM) {
-               AddressItem *item = ADDRESS_ITEM(obj);
-
-               mgu_free_address( item );
-       } else if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
-
-               g_free(group->name);
-               while (group->items != NULL) {
-                       addressbook_delete_object
-                               (ADDRESS_OBJECT(group->items->data));
-                       group->items = g_list_remove(group->items,
-                                                    group->items->data);
-               }
-               g_free(group);
-       } else if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
-
-               g_free(folder->name);
-               while (folder->items != NULL) {
-                       addressbook_delete_object
-                               (ADDRESS_OBJECT(folder->items->data));
-                       folder->items = g_list_remove(folder->items,
-                                                     folder->items->data);
-               }
-               g_free(folder);
-       }
-       else if( obj->type == ADDR_VCARD ) {
-               AddressVCard *vcard = ADDRESS_VCARD(obj);
-               g_free( vcard->name );
-               vcard_free( vcard->cardFile );
-               vcard->cardFile = NULL;
-               vcard->items = NULL;
-               g_free( vcard );
-       }
-#ifdef USE_JPILOT
-       else if( obj->type == ADDR_JPILOT ) {
-               AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               g_free( jpilot->name );
-               jpilot_free( jpilot->pilotFile );
-               jpilot->pilotFile = NULL;
-               jpilot->items = NULL;
-               g_free( jpilot );
-       }
-#endif
-#ifdef USE_LDAP
-       else if( obj->type == ADDR_LDAP ) {
-               AddressLDAP *ldapi = ADDRESS_LDAP(obj);
-               g_free( ldapi->name );
-               syldap_free( ldapi->ldapServer );
-               ldapi->ldapServer = NULL;
-               ldapi->items = NULL;
-               g_free( ldapi );
+static void addressbook_folder_refresh_one_person( GtkCTree *clist, ItemPerson *person ) {
+       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+       AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+       GtkCTreeNode *node;
+       if( atci == NULL ) return;
+       if( atciMail == NULL ) return;
+       if( person == NULL ) return;
+       /* unload the person */
+       
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       if( node )
+               addressbook_folder_remove_node( clist, node );
+       addressbook_folder_load_one_person( clist, person, atci, atciMail );
+       gtk_sctree_sort_node( clist, NULL );
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       if( node ) {
+               gtk_sctree_select( GTK_SCTREE(clist), node );
+               if (!gtk_ctree_node_is_visible( clist, node ) ) 
+                       gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
        }
-#endif
 }
 
-static AddressObject *addressbook_find_object_by_name(GtkCTreeNode *node,
-                                                     const gchar *name)
-{
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
-       AddressObject *obj;
-       GList *found;
-
-       g_return_val_if_fail(node != NULL, NULL);
+static void addressbook_folder_remove_one_person( GtkCTree *clist, ItemPerson *person ) {
+       GtkCTreeNode *node;
+       gint row;
+       
+       if( person == NULL ) return;
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       row  = gtk_clist_find_row_from_data( GTK_CLIST(clist), person );
+       if( node ) {
+               addressbook_folder_remove_node( clist, node );
+       }
+}
 
-       obj = gtk_ctree_node_get_row_data(ctree, node);
-       g_return_val_if_fail(obj != NULL, NULL);
+static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFolder ) {
+       GList *items;
+       AddressTypeControlItem *atci =  addrbookctl_lookup( ADDR_ITEM_GROUP );
+
+       /* Load any groups */
+       if( ! atci ) return;
+       items = addritem_folder_get_group_list( itemFolder );
+       for( ; items != NULL; items = g_list_next( items ) ) {
+               GtkCTreeNode *nodeGroup = NULL;
+               gchar *text[N_LIST_COLS];
+               ItemGroup *group = items->data;
+               if( group == NULL ) continue;
+               text[COL_NAME] = ADDRITEM_NAME(group);
+               text[COL_ADDRESS] = NULL;
+               text[COL_REMARKS] = NULL;
+               nodeGroup = gtk_ctree_insert_node(clist, NULL, NULL,
+                                     text, FOLDER_SPACING,
+                                     atci->iconXpm, atci->maskXpm,
+                                     atci->iconXpmOpen, atci->maskXpmOpen,
+                                     FALSE, FALSE);
+               gtk_ctree_node_set_row_data(clist, nodeGroup, group );
+               gtk_sctree_sort_node(clist, NULL);
+       }
+       /* Free up the list */
+       mgu_clear_list( items );
+       g_list_free( items );
+}
 
-       if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
+/**
+ * Search ctree widget callback function.
+ * \param  pA Pointer to node.
+ * \param  pB Pointer to data item being sought.
+ * \return Zero (0) if group found.
+ */
+static int addressbook_treenode_find_group_cb( gconstpointer pA, gconstpointer pB ) {
+       AddressObject *aoA;
 
-               found = g_list_find_custom(group->items, (gpointer)name,
-                                          addressbook_obj_name_compare);
-               if (found) return ADDRESS_OBJECT(found->data);
-       } else if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
+       aoA = ( AddressObject * ) pA;
+       if( aoA->type == ADDR_ITEM_GROUP ) {
+               ItemGroup *group, *grp;
 
-               found = g_list_find_custom(folder->items, (gpointer)name,
-                                          addressbook_obj_name_compare);
-               if (found) return ADDRESS_OBJECT(found->data);
-       } else if (obj->type == ADDR_ITEM) {
-               if (!addressbook_obj_name_compare(obj, name)) return obj;
+               grp = ADAPTER_GROUP(aoA)->itemGroup;
+               group = ( ItemGroup * ) pB;
+               if( grp == group ) return 0;    /* Found group */
        }
-
-       return NULL;
+       return 1;
 }
 
-static AddressItem *addressbook_parse_item(XMLFile *file)
-{
-       gchar *element;
-       AddressItem *item;
-       guint level;
+/**
+ * Search ctree widget callback function.
+ * \param  pA Pointer to node.
+ * \param  pB Pointer to data item being sought.
+ * \return Zero (0) if folder found.
+ */
+static int addressbook_treenode_find_folder_cb( gconstpointer pA, gconstpointer pB ) {
+       AddressObject *aoA;
 
-       item = mgu_create_address();
-       ADDRESS_OBJECT(item)->type = ADDR_ITEM;
+       aoA = ( AddressObject * ) pA;
+       if( aoA->type == ADDR_ITEM_FOLDER ) {
+               ItemFolder *folder, *fld;
 
-       level = file->level;
+               fld = ADAPTER_FOLDER(aoA)->itemFolder;
+               folder = ( ItemFolder * ) pB;
+               if( fld == folder ) return 0;   /* Found folder */
+       }
+       return 1;
+}
 
-       while (xml_parse_next_tag(file) == 0) {
-               if (file->level < level) return item;
-               if (file->level == level) break;
+/*
+* Remove folder and group nodes from tree widget for items contained ("cut")
+* in clipboard.
+*/
+static void addressbook_treenode_remove_item( void ) {
+       GList *node;
+       AddrSelectItem *cutItem;
+       AddressCache *cache;
+       AddrItemObject *aio;
+       GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+       GtkCTreeNode *tn;
+
+       node = _clipBoard_->objectList;
+       while( node ) {
+               cutItem = node->data;
+               node = g_list_next( node );
+               cache = addrindex_get_cache(
+                       _clipBoard_->addressIndex, cutItem->cacheID );
+               if( cache == NULL ) continue;
+               aio = addrcache_get_object( cache, cutItem->uid );
+               if( aio ) {
+                       tn = NULL;
+                       if( ADDRITEM_TYPE(aio) == ITEMTYPE_FOLDER ) {
+                               ItemFolder *folder;
+
+                               folder = ( ItemFolder * ) aio;
+                               tn = gtk_ctree_find_by_row_data_custom(
+                                       ctree, NULL, folder,
+                                       addressbook_treenode_find_folder_cb );
+                       }
+                       else if( ADDRITEM_TYPE(aio) == ITEMTYPE_GROUP ) {
+                               ItemGroup *group;
 
-               element = xml_get_element(file);
+                               group = ( ItemGroup * ) aio;
+                               tn = gtk_ctree_find_by_row_data_custom(
+                                       ctree, NULL, group,
+                                       addressbook_treenode_find_group_cb );
+                       }
 
-               if (xml_compare_tag(file, "name")) {
-                       item->name = element;
-               } else if (xml_compare_tag(file, "address")) {
-                       item->address = element;
-               } else if (xml_compare_tag(file, "remarks")) {
-                       item->remarks = element;
+                       if( tn ) {
+                               /* Free up adapter and remove node. */
+                               gtk_ctree_remove_node( ctree, tn );
+                       }
                }
-
-               if (xml_parse_next_tag(file) < 0) break;
-               if (file->level != level) break;
        }
-
-       g_warning("addressbook_parse_item(): Parse error\n");
-       mgu_free_address( item );
 }
 
-void addressbook_export_to_file(void)
-{
-       PrefFile *pfile;
-       gchar *path;
+/**
+ * Find parent datasource for specified tree node.
+ * \param  node Node to test.
+ * \return Data source, or NULL if not found.
+ */
+static AddressDataSource *addressbook_find_datasource( GtkCTreeNode *node ) {
+       AddressDataSource *ds = NULL;
+       AddressObject *ao;
 
-       if (!addrbook.ctree) return;
+       g_return_val_if_fail(addrbook.ctree != NULL, NULL);
+
+       while( node ) {
+               if( GTK_CTREE_ROW(node)->level < 2 ) return NULL;
+               ao = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
+               if( ao ) {
+                       /* printf( "ao->type = %d\n", ao->type ); */
+                       if( ao->type == ADDR_DATASOURCE ) {
+                               AdapterDSource *ads = ADAPTER_DSOURCE(ao);
+                               /* printf( "found it\n" ); */
+                               ds = ads->dataSource;
+                               break;
+                       }
+               }
+               node = GTK_CTREE_ROW(node)->parent;
+       }
+       return ds;
+}
 
-       debug_print(_("Exporting addressbook to file..."));
+/**
+ * Load address list widget with children of specified object.
+ * \param obj Parent object to be loaded.
+ */
+static void addressbook_set_clist( AddressObject *obj ) {
+       GtkCTree *ctreelist = GTK_CTREE(addrbook.clist);
+       GtkCList *clist = GTK_CLIST(addrbook.clist);
+       AddressDataSource *ds = NULL;
+       AdapterDSource *ads = NULL;
 
-       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ADDRESS_BOOK, NULL);
-       if ((pfile = prefs_write_open(path)) == NULL) {
-               g_free(path);
+       if( obj == NULL ) {
+               gtk_clist_clear(clist);
                return;
        }
-       g_free(path);
-
-       fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
-               conv_get_current_charset_str());
-       fputs("<addressbook>\n\n", pfile->fp);
-
-       addressbook_xml_recursive_write(NULL, pfile->fp);
-
-       fputs("</addressbook>\n", pfile->fp);
 
-       if (prefs_write_close(pfile) < 0) {
-               g_warning(_("failed to write addressbook data.\n"));
+       if( obj->type == ADDR_INTERFACE ) {
+               /* printf( "set_clist: loading datasource...\n" ); */
+               /* addressbook_node_load_datasource( GTK_CTREE(clist), obj ); */
                return;
        }
 
-       debug_print(_("done.\n"));
-}
+       gtk_clist_freeze(clist);
+       gtk_clist_clear(clist);
 
-/* Most part of this function was taken from gtk_ctree_pre_recursive() and
-   gtk_ctree_post_recursive(). */
-static void addressbook_xml_recursive_write(GtkCTreeNode *node, FILE *fp)
-{
-       GtkCTreeNode *work;
-       GtkCTreeNode *tmp;
+       if( obj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(obj);
+               ds = ADAPTER_DSOURCE(obj)->dataSource;
+               if( ds ) {
+                       /* Load root folder */
+                       ItemFolder *rootFolder = NULL;
+                       rootFolder = addrindex_ds_get_root_folder( ds );
+                       addressbook_folder_load_person(
+                               ctreelist, addrindex_ds_get_root_folder( ds ) );
+                       addressbook_folder_load_group(
+                               ctreelist, addrindex_ds_get_root_folder( ds ) );
+               }
+       }
+       else {
+               if( obj->type == ADDR_ITEM_GROUP ) {
+                       /* Load groups */
+                       ItemGroup *itemGroup = ADAPTER_GROUP(obj)->itemGroup;
+                       addressbook_load_group( ctreelist, itemGroup );
+               }
+               else if( obj->type == ADDR_ITEM_FOLDER ) {
+                       /* Load folders */
+                       ItemFolder *itemFolder = ADAPTER_FOLDER(obj)->itemFolder;
+                       addressbook_folder_load_person( ctreelist, itemFolder );
+                       addressbook_folder_load_group( ctreelist, itemFolder );
+               }
+       }
+       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+       gtk_clist_thaw(clist);
+}
 
-       if (node) {
-               work = GTK_CTREE_ROW(node)->children;
-               addressbook_node_write_begin(node, fp);
-       } else
-               work = GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list);
+/**
+ * Call back function to free adaptor. Call back is setup by function
+ * gtk_ctree_node_set_row_data_full() when node is populated. This function is
+ * called when the address book tree widget node is removed by calling
+ * function gtk_ctree_remove_node().
+ * 
+ * \param data Tree node's row data.
+ */
+static void addressbook_free_treenode( gpointer data ) {
+       AddressObject *ao;
 
-       while (work) {
-               tmp = GTK_CTREE_ROW(work)->sibling;
-               addressbook_xml_recursive_write(work, fp);
-               work = tmp;
+       ao = ( AddressObject * ) data;
+       if( ao == NULL ) return;
+       if( ao->type == ADDR_INTERFACE ) {
+               AdapterInterface *ai = ADAPTER_INTERFACE(ao);
+               addrbookctl_free_interface( ai );
+       }
+       else if( ao->type == ADDR_DATASOURCE ) {
+               AdapterDSource *ads = ADAPTER_DSOURCE(ao);
+               addrbookctl_free_datasource( ads );
+       }
+       else if( ao->type == ADDR_ITEM_FOLDER ) {
+               AdapterFolder *af = ADAPTER_FOLDER(ao);
+               addrbookctl_free_folder( af );
+       }
+       else if( ao->type == ADDR_ITEM_GROUP ) {
+               AdapterGroup *ag = ADAPTER_GROUP(ao);
+               addrbookctl_free_group( ag );
        }
-
-       if (node)
-               addressbook_node_write_end(node, fp);
 }
 
-static void addressbook_node_write_begin(GtkCTreeNode *node, FILE *fp)
+/*
+* Create new adaptor for specified data source.
+*/
+AdapterDSource *addressbook_create_ds_adapter( AddressDataSource *ds,
+                               AddressObjectType otype, gchar *name )
 {
-       AddressObject *obj;
+       AdapterDSource *adapter = g_new0( AdapterDSource, 1 );
+       ADDRESS_OBJECT(adapter)->type = ADDR_DATASOURCE;
+       ADDRESS_OBJECT_NAME(adapter) = g_strdup( name );
+       adapter->dataSource = ds;
+       adapter->subType = otype;
+       return adapter;
+}
 
-       obj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), node);
-       g_return_if_fail(obj != NULL);
+void addressbook_ads_set_name( AdapterDSource *adapter, gchar *value ) {
+       ADDRESS_OBJECT_NAME(adapter) =
+               mgu_replace_string( ADDRESS_OBJECT_NAME(adapter), value );
+}
 
-       if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
+/*
+ * Load tree from address index with the initial data.
+ */
+static void addressbook_load_tree( void ) {
+       GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
+       GList *nodeIf, *nodeDS;
+       AdapterInterface *adapter;
+       AddressInterface *iface;
+       AddressTypeControlItem *atci;
+       AddressDataSource *ds;
+       AdapterDSource *ads;
+       GtkCTreeNode *node, *newNode;
+       gchar *name;
 
-               if (GTK_CTREE_ROW(node)->level == 1) {
-                       fprintf(fp, "<%s>\n", folder->name);
-               } else {
-                       tab_indent_out(fp, GTK_CTREE_ROW(node)->level - 1);
-                       fputs("<folder name=\"", fp);
-                       xml_file_put_escape_str(fp, folder->name);
-                       fputs("\">\n", fp);
+       nodeIf = _addressInterfaceList_;
+       while( nodeIf ) {
+               adapter = nodeIf->data;
+               node = adapter->treeNode;
+               iface = adapter->interface;
+               atci = adapter->atci;
+               if( iface ) {
+                       if( iface->useInterface ) {
+                               /* Load data sources below interface node */
+                               nodeDS = iface->listSource;
+                               while( nodeDS ) {
+                                       ds = nodeDS->data;
+                                       newNode = NULL;
+                                       name = addrindex_ds_get_name( ds );
+                                       ads = addressbook_create_ds_adapter(
+                                                       ds, atci->objectType, name );
+                                       newNode = addressbook_add_object(
+                                                       node, ADDRESS_OBJECT(ads) );
+                                       nodeDS = g_list_next( nodeDS );
+                               }
+                               gtk_ctree_expand( ctree, node );
+                       }
                }
-       } else if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
-
-               tab_indent_out(fp, GTK_CTREE_ROW(node)->level - 1);
-               fputs("<group name=\"", fp);
-               xml_file_put_escape_str(fp, group->name);
-               fputs("\">\n", fp);
+               nodeIf = g_list_next( nodeIf );
        }
 }
 
-static void addressbook_node_write_end(GtkCTreeNode *node, FILE *fp)
-{
-       AddressObject *obj;
-
-       obj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), node);
-       g_return_if_fail(obj != NULL);
-
-       if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
-
-               addressbook_write_items(fp, folder->items,
-                                       GTK_CTREE_ROW(node)->level);
-
-               if (GTK_CTREE_ROW(node)->level == 1) {
-                       fprintf(fp, "</%s>\n\n", folder->name);
-               } else {
-                       tab_indent_out(fp, GTK_CTREE_ROW(node)->level - 1);
-                       fputs("</folder>\n", fp);
+/*
+ * Convert the old address book to new format.
+ */
+static gboolean addressbook_convert( AddressIndex *addrIndex ) {
+       gboolean retVal = FALSE;
+       gboolean errFlag = TRUE;
+       gchar *msg = NULL;
+
+       /* Read old address book, performing conversion */
+       debug_print( "Reading and converting old address book...\n" );
+       addrindex_set_file_name( addrIndex, ADDRESSBOOK_OLD_FILE );
+       addrindex_read_data( addrIndex );
+       if( addrIndex->retVal == MGU_NO_FILE ) {
+               /* We do not have a file - new user */
+               debug_print( "New user... create new books...\n" );
+               addrindex_create_new_books( addrIndex );
+               if( addrIndex->retVal == MGU_SUCCESS ) {
+                       /* Save index file */
+                       addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
+                       addrindex_save_data( addrIndex );
+                       if( addrIndex->retVal == MGU_SUCCESS ) {
+                               retVal = TRUE;
+                               errFlag = FALSE;
+                       }
+                       else {
+                               msg = _( "New user, could not save index file." );
+                       }
+               }
+               else {
+                       msg = _( "New user, could not save address book files." );
                }
-       } else if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
-
-               addressbook_write_items(fp, group->items,
-                                       GTK_CTREE_ROW(node)->level);
-
-               tab_indent_out(fp, GTK_CTREE_ROW(node)->level - 1);
-               fputs("</group>\n", fp);
        }
-       else if (obj->type == ADDR_VCARD) {
-               AddressVCard *vcard = ADDRESS_VCARD(obj);
-               addressbook_write_vcard( fp, vcard, GTK_CTREE_ROW(node)->level);
+       else {
+               /* We have an old file */
+               if( addrIndex->wasConverted ) {
+                       /* Converted successfully - save address index */
+                       addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
+                       addrindex_save_data( addrIndex );
+                       if( addrIndex->retVal == MGU_SUCCESS ) {
+                               msg = _( "Old address book converted successfully." );
+                               retVal = TRUE;
+                               errFlag = FALSE;
+                       }
+                       else {
+                               msg = _("Old address book converted,\n"
+                                       "could not save new address index file" );
+                       }
+               }
+               else {
+                       /* File conversion failed - just create new books */
+                       debug_print( "File conversion failed... just create new books...\n" );
+                       addrindex_create_new_books( addrIndex );
+                       if( addrIndex->retVal == MGU_SUCCESS ) {
+                               /* Save index */
+                               addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
+                               addrindex_save_data( addrIndex );
+                               if( addrIndex->retVal == MGU_SUCCESS ) {
+                                       msg = _("Could not convert address book,\n"
+                                               "but created empty new address book files." );
+                                       retVal = TRUE;
+                                       errFlag = FALSE;
+                               }
+                               else {
+                                       msg = _("Could not convert address book,\n"
+                                               "could not create new address book files." );
+                               }
+                       }
+                       else {
+                               msg = _("Could not convert address book\n"
+                                       "and could not create new address book files." );
+                       }
+               }
        }
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               addressbook_write_jpilot( fp, jpilot, GTK_CTREE_ROW(node)->level);
+       if( errFlag ) {
+               debug_print( "Error\n%s\n", msg );
+               alertpanel_full(_("Addressbook conversion error"), msg,
+                               GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+                               NULL, ALERT_ERROR, G_ALERTDEFAULT);
        }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               AddressLDAP *ldap = ADDRESS_LDAP(obj);
-               addressbook_write_ldap( fp, ldap, GTK_CTREE_ROW(node)->level);
+       else if( msg ) {
+               debug_print( "Warning\n%s\n", msg );
+               alertpanel_full(_("Addressbook conversion error"), msg,
+                               GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
        }
-#endif
+
+       return retVal;
 }
 
-static void addressbook_write_items(FILE *fp, GList *items, guint level)
-{
-       AddressItem *item;
+void addressbook_read_file( void ) {
+       AddressIndex *addrIndex = NULL;
+
+       debug_print( "Reading address index...\n" );
+       if( _addressIndex_ ) {
+               debug_print( "address book already read!!!\n" );
+               return;
+       }
 
-       for (; items != NULL; items = items->next) {
-               if (ADDRESS_OBJECT_TYPE(items->data) == ADDR_ITEM) {
-                       item = ADDRESS_ITEM(items->data);
+       addrIndex = addrindex_create_index();
+       addrindex_initialize();
 
-                       tab_indent_out(fp, level);
-                       fputs("<item>\n", fp);
+       /* Use new address book index. */
+       addrindex_set_file_path( addrIndex, get_rc_dir() );
+       addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
+       addrindex_read_data( addrIndex );
+       if( addrIndex->retVal == MGU_NO_FILE ) {
+               /* Conversion required */
+               debug_print( "Converting...\n" );
+               if( addressbook_convert( addrIndex ) ) {
+                       _addressIndex_ = addrIndex;
+               }
+       }
+       else if( addrIndex->retVal == MGU_SUCCESS ) {
+               _addressIndex_ = addrIndex;
+       }
+       else {
+               /* Error reading address book */
+               debug_print( "Could not read address index.\n" );
+               addrindex_print_index( addrIndex, stdout );
+               alertpanel_full(_("Addressbook Error"),
+                               _("Could not read address index"),
+                               GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+                               NULL, ALERT_ERROR, G_ALERTDEFAULT);
+       }
+       debug_print( "done.\n" );
+}
 
-                       tab_indent_out(fp, level + 1);
-                       fputs("<name>", fp);
-                       xml_file_put_escape_str(fp, item->name);
-                       fputs("</name>\n", fp);
+/*
+* Add object into the address index tree widget.
+* Enter: node  Parent node.
+*        obj   Object to add.
+* Return: Node that was added, or NULL if object not added.
+*/
+static GtkCTreeNode *addressbook_add_object(GtkCTreeNode *node,
+                                           AddressObject *obj)
+{
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       GtkCTreeNode *added;
+       AddressObject *pobj;
+       AddressObjectType otype;
+       AddressTypeControlItem *atci = NULL;
 
-                       tab_indent_out(fp, level + 1);
-                       fputs("<address>", fp);
-                       xml_file_put_escape_str(fp, item->address);
-                       fputs("</address>\n", fp);
+       g_return_val_if_fail(node != NULL, NULL);
+       g_return_val_if_fail(obj  != NULL, NULL);
 
-                       tab_indent_out(fp, level + 1);
-                       fputs("<remarks>", fp);
-                       xml_file_put_escape_str(fp, item->remarks);
-                       fputs("</remarks>\n", fp);
+       pobj = gtk_ctree_node_get_row_data(ctree, node);
+       g_return_val_if_fail(pobj != NULL, NULL);
 
-                       tab_indent_out(fp, level);
-                       fputs("</item>\n", fp);
+       /* Determine object type to be displayed */
+       if( obj->type == ADDR_DATASOURCE ) {
+               otype = ADAPTER_DSOURCE(obj)->subType;
+       }
+       else {
+               otype = obj->type;
+       }
+
+       /* Handle any special conditions. */
+       added = node;
+       atci = addrbookctl_lookup( otype );
+       if( atci ) {
+               if( atci->showInTree ) {
+                       /* Add object to tree */
+                       gchar **name;
+                       name = &obj->name;
+                       added = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+                               atci->iconXpm, atci->maskXpm, atci->iconXpmOpen, atci->maskXpmOpen,
+                               atci->treeLeaf, atci->treeExpand );
+                       gtk_ctree_node_set_row_data_full( ctree, added, obj,
+                               addressbook_free_treenode );
                }
        }
-}
 
-static void tab_indent_out(FILE *fp, guint level)
-{
-       gint i;
+       gtk_sctree_sort_node(ctree, node);
 
-       for (i = 0; i < level; i++)
-               fputs("    ", fp);
+       return added;
 }
 
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+/**
+ * Add group into the address index tree.
+ * \param  node      Parent node.
+ * \param  ds        Data source.
+ * \param  itemGroup Group to add.
+ * \return Inserted node.
+ */
+static GtkCTreeNode *addressbook_node_add_group(
+               GtkCTreeNode *node, AddressDataSource *ds,
+               ItemGroup *itemGroup )
 {
-       if (event && event->keyval == GDK_Escape)
-               addressbook_close();
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       GtkCTreeNode *newNode;
+       AdapterGroup *adapter;
+       AddressTypeControlItem *atci = NULL;
+       gchar **name;
+
+       if( ds == NULL ) return NULL;
+       if( node == NULL || itemGroup == NULL ) return NULL;
+
+       name = &itemGroup->obj.name;
+
+       atci = addrbookctl_lookup( ADDR_ITEM_GROUP );
+
+       adapter = g_new0( AdapterGroup, 1 );
+       ADDRESS_OBJECT_TYPE(adapter) = ADDR_ITEM_GROUP;
+       ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemGroup) );
+       adapter->itemGroup = itemGroup;
+
+       newNode = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+                       atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
+                       atci->treeLeaf, atci->treeExpand );
+       gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+               addressbook_free_treenode );
+       gtk_sctree_sort_node( ctree, node );
+       return newNode;
 }
 
-static gint addressbook_list_compare_func(GtkCList *clist,
-                                         gconstpointer ptr1,
-                                         gconstpointer ptr2)
+/**
+ * Add folder into the address index tree. Only visible folders are loaded into
+ * the address index tree. Note that the root folder is not inserted into the
+ * tree.
+ *
+ * \param  node              Parent node.
+ * \param  ds         Data source.
+ * \param  itemFolder Folder to add.
+ * \param  otype      Object type to display.
+ * \return Inserted node for the folder.
+*/
+static GtkCTreeNode *addressbook_node_add_folder(
+               GtkCTreeNode *node, AddressDataSource *ds,
+               ItemFolder *itemFolder, AddressObjectType otype )
 {
-       AddressObject *obj1 = ((GtkCListRow *)ptr1)->data;
-       AddressObject *obj2 = ((GtkCListRow *)ptr2)->data;
-       gchar *name1, *name2;
-
-       if (obj1) {
-               if (obj1->type == ADDR_ITEM)
-                       name1 = ADDRESS_ITEM(obj1)->name;
-               else if (obj1->type == ADDR_GROUP)
-                       name1 = ADDRESS_GROUP(obj1)->name;
-               else if (obj1->type == ADDR_FOLDER)
-                       name1 = ADDRESS_FOLDER(obj1)->name;
-               else if (obj1->type == ADDR_VCARD)
-                       name1 = ADDRESS_VCARD(obj1)->name;
-#ifdef USE_JPILOT
-               else if (obj1->type == ADDR_JPILOT)
-                       name1 = ADDRESS_JPILOT(obj1)->name;
-               else if (obj1->type == ADDR_CATEGORY)
-                       name1 = ADDRESS_CATEGORY(obj1)->name;
-#endif
-#ifdef USE_LDAP
-               else if (obj1->type == ADDR_LDAP)
-                       name1 = ADDRESS_LDAP(obj1)->name;
-#endif
-               else
-                       name1 = NULL;
-       } else
-               name1 = NULL;
-
-       if (obj2) {
-               if (obj2->type == ADDR_ITEM)
-                       name2 = ADDRESS_ITEM(obj2)->name;
-               else if (obj2->type == ADDR_GROUP)
-                       name2 = ADDRESS_GROUP(obj2)->name;
-               else if (obj2->type == ADDR_FOLDER)
-                       name2 = ADDRESS_FOLDER(obj2)->name;
-               else if (obj2->type == ADDR_VCARD)
-                       name2 = ADDRESS_VCARD(obj2)->name;
-#ifdef USE_JPILOT
-               else if (obj2->type == ADDR_JPILOT)
-                       name2 = ADDRESS_JPILOT(obj2)->name;
-               else if (obj2->type == ADDR_CATEGORY)
-                       name2 = ADDRESS_CATEGORY(obj2)->name;
-#endif
-#ifdef USE_LDAP
-               else if (obj2->type == ADDR_LDAP)
-                       name2 = ADDRESS_LDAP(obj2)->name;
-#endif
-               else
-                       name2 = NULL;
-       } else
-               name2 = NULL;
-
-       if (!name1)
-               return (name2 != NULL);
-       if (!name2)
-               return -1;
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       GtkCTreeNode *newNode = NULL;
+       AdapterFolder *adapter;
+       AddressTypeControlItem *atci = NULL;
+       GList *listItems = NULL;
+       gchar *name;
+       ItemFolder *rootFolder;
 
-       return strcasecmp(name1, name2);
-}
+       /* Only visible folders */
+       if( itemFolder->isHidden ) return NULL;
 
-static gint addressbook_obj_name_compare(gconstpointer a, gconstpointer b)
-{
-       const AddressObject *obj = a;
-       const gchar *name = b;
+       if( ds == NULL ) return NULL;
+       if( node == NULL || itemFolder == NULL ) return NULL;
 
-       if (!obj || !name) return -1;
+       /* Determine object type */
+       atci = addrbookctl_lookup( otype );
+       if( atci == NULL ) return NULL;
 
-       if (obj->type == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(obj);
-               if (!group->name)
-                       return -1;
-               else
-                       return strcasecmp(group->name, name);
-       } else if (obj->type == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(obj);
-               if (!folder->name)
-                       return -1;
-               else
-                       return strcasecmp(folder->name, name);
-       }
-       else if (obj->type == ADDR_VCARD) {
-               AddressVCard *vcard = ADDRESS_VCARD(obj);
-               if (!vcard->name)
-                       return -1;
-               else
-                       return strcasecmp(vcard->name, name);
+       rootFolder = addrindex_ds_get_root_folder( ds );
+       if( itemFolder == rootFolder ) {
+               newNode = node;
        }
-#ifdef USE_JPILOT
-       else if (obj->type == ADDR_JPILOT) {
-               AddressJPilot *jpilot = ADDRESS_JPILOT(obj);
-               if (!jpilot->name)
-                       return -1;
-               else
-                       return strcasecmp(jpilot->name, name);
+       else {
+               adapter = g_new0( AdapterFolder, 1 );
+               ADDRESS_OBJECT_TYPE(adapter) = ADDR_ITEM_FOLDER;
+               ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemFolder) );
+               adapter->itemFolder = itemFolder;
+
+               name = ADDRITEM_NAME(itemFolder);
+               newNode = gtk_ctree_insert_node( ctree, node, NULL, &name, FOLDER_SPACING,
+                               atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
+                               atci->treeLeaf, atci->treeExpand );
+               if( newNode ) {
+                       gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+                               addressbook_free_treenode );
+               }
        }
-       else if (obj->type == ADDR_CATEGORY) {
-               AddressCategory *category = ADDRESS_CATEGORY(obj);
-               if (!category->name)
-                       return -1;
-               else
-                       return strcasecmp(category->name, name);
+
+       listItems = itemFolder->listFolder;
+       while( listItems ) {
+               ItemFolder *item = listItems->data;
+               addressbook_node_add_folder( newNode, ds, item, otype );
+               listItems = g_list_next( listItems );
        }
-#endif
-#ifdef USE_LDAP
-       else if (obj->type == ADDR_LDAP) {
-               AddressLDAP *server = ADDRESS_LDAP(obj);
-               if (!server->name)
-                       return -1;
-               else
-                       return strcasecmp(server->name, name);
+       listItems = itemFolder->listGroup;
+       while( listItems ) {
+               ItemGroup *item = listItems->data;
+               addressbook_node_add_group( newNode, ds, item );
+               listItems = g_list_next( listItems );
        }
-#endif
-       else if (obj->type == ADDR_ITEM) {
-               AddressItem *item = ADDRESS_ITEM(obj);
-               if (!item->name)
-                       return -1;
-               else
-                       return strcasecmp(item->name, name);
-       } else
-               return -1;
+       gtk_sctree_sort_node( ctree, node );
+       return newNode;
 }
 
-static AddressVCard *addressbook_parse_vcard(XMLFile *file) {
-       AddressVCard *item = NULL;
-       VCardFile *vcf;
-       GList *attr;
-       gchar *name, *value;
+void addressbook_export_to_file( void ) {
+       if( _addressIndex_ ) {
+               /* Save all new address book data */
+               debug_print( "Saving address books...\n" );
+               addrindex_save_all_books( _addressIndex_ );
 
-       vcf = vcard_create();
-       attr = xml_get_current_tag_attr( file );
-       while( attr ) {
-               name = ((XMLAttr *)attr->data)->name;
-               value = ((XMLAttr *)attr->data)->value;
-               if( strcmp( name, "name" ) == 0 ) {
-                       vcard_set_name( vcf, value );
+               debug_print( "Exporting addressbook to file...\n" );
+               addrindex_save_data( _addressIndex_ );
+               if( _addressIndex_->retVal != MGU_SUCCESS ) {
+                       addrindex_print_index( _addressIndex_, stdout );
                }
-               else if( strcmp( name, "file" ) == 0) {
-                       vcard_set_file( vcf, value );
-               }
-               attr = g_list_next( attr );
-       }
 
-       // Move to next tag
-       if( xml_parse_next_tag( file ) >= 0 ) {
-               if( vcard_validate( vcf ) ) {
-                       item = g_new( AddressVCard, 1 );
-                       ADDRESS_OBJECT(item)->type = ADDR_VCARD;
-                       item->name = g_strdup( vcf->name );
-                       item->cardFile = vcf;
-                       item->items = NULL;
-                       return item;
-               }
+               /* Notify address completion of new data */
+               invalidate_address_completion();
        }
+}
 
-       // Must be an invalid tag or data.
-       g_warning( "addressbook_parse_vcard(): Parse error\n");
-       vcard_free( vcf );
-       vcf = NULL;
-       item = NULL;
-       return NULL;
+static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       if (event && event->keyval == GDK_Return)
+               addressbook_lup_clicked(NULL, NULL);
+       return FALSE;
 }
 
-static void addressbook_write_vcard( FILE *fp, AddressVCard *vcard, guint level ) {
-       VCardFile *cardFile = vcard->cardFile;
-       if( cardFile ) {
-               tab_indent_out(fp, 1);
-               fputs("<vcard ", fp);
-               fputs("name=\"", fp);
-               xml_file_put_escape_str(fp, cardFile->name);
-               fputs("\"", fp);
-               fputs(" file=\"", fp);
-               xml_file_put_escape_str(fp, cardFile->path);
-               fputs("\"", fp);
-               fputs(" />\n", fp);
-       }
+/*
+* Comparison using cell contents (text in first column). Used for sort
+* address index widget.
+*/
+static gint addressbook_treenode_compare_func(
+       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+{
+       GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
+       GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+       gchar *name1 = NULL, *name2 = NULL;
+       if( cell1 ) name1 = cell1->u.text;
+       if( cell2 ) name2 = cell2->u.text;
+       if( ! name1 ) return ( name2 != NULL );
+       if( ! name2 ) return -1;
+       return g_utf8_collate( name1, name2 );
 }
 
-#ifdef USE_JPILOT
-static AddressJPilot *addressbook_parse_jpilot(XMLFile *file) {
-       AddressJPilot *item = NULL;
-       JPilotFile *jpf;
-       GList *attr;
-       gchar *name, *value;
+/*
+* Comparison using object names and types.
+*/
+static gint addressbook_list_compare_func(
+       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+{
+       AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
+       AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
+       gchar *name1 = NULL, *name2 = NULL;
 
-       jpf = jpilot_create();
-       attr = xml_get_current_tag_attr( file );
-       while( attr ) {
-               name = ((XMLAttr *)attr->data)->name;
-               value = ((XMLAttr *)attr->data)->value;
-               if( strcmp( name, "name" ) == 0 ) {
-                       jpilot_set_name( jpf, value );
-               }
-               else if( strcmp( name, "file" ) == 0 ) {
-                       jpilot_set_file( jpf, value );
-               }
-               else if( strcmp( name, "custom-1" ) == 0 ) {
-                       jpilot_add_custom_label( jpf, value );
-               }
-               else if( strcmp( name, "custom-2" ) == 0 ) {
-                       jpilot_add_custom_label( jpf, value );
-               }
-               else if( strcmp( name, "custom-3" ) == 0 ) {
-                       jpilot_add_custom_label( jpf, value );
+       /* Order by cell contents */
+       name1 = ADDRITEM_NAME( aio1 );
+       name2 = ADDRITEM_NAME( aio2 );
+
+       if( aio1->type == aio2->type ) {
+               /* Order by name */
+               if( ! name1 ) return ( name2 != NULL );
+               if( ! name2 ) return -1;
+               return g_utf8_collate( name1, name2 );
+       }
+       else {
+               /* Order groups before person */
+               if( aio1->type == ITEMTYPE_GROUP ) {
+                       return -1;
                }
-               else if( strcmp( name, "custom-4" ) == 0 ) {
-                       jpilot_add_custom_label( jpf, value );
+               else if( aio2->type == ITEMTYPE_GROUP ) {
+                       return 1;
                }
-               attr = g_list_next( attr );
+               return 0;
        }
+}
 
-       // Move to next tag
-       if( xml_parse_next_tag( file ) >= 0 ) {
-               if( jpilot_validate( jpf ) ) {
-                       item = g_new( AddressJPilot, 1 );
-                       ADDRESS_OBJECT(item)->type = ADDR_JPILOT;
-                       item->name = g_strdup( jpf->name );
-                       item->pilotFile = jpf;
-                       item->items = NULL;
-                       return item;
+static void addressbook_new_book_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AdapterDSource *ads;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+       if( adapter == NULL ) return;
+       ads = addressbook_edit_book( _addressIndex_, NULL );
+       if( ads ) {
+               newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+               if( newNode ) {
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
+                       addrbook.treeSelected = newNode;
                }
        }
+}
 
-       // Must be an invalid tag or data.
-       g_warning( "addressbook_parse_jpilot(): Parse error\n");
-       jpilot_free( jpf );
-       jpf = NULL;
-       item = NULL;
-       return NULL;
+static void addressbook_new_vcard_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AdapterDSource *ads;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_VCARD );
+       if( adapter == NULL ) return;
+       ads = addressbook_edit_vcard( _addressIndex_, NULL );
+       if( ads ) {
+               newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+               if( newNode ) {
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
+                       addrbook.treeSelected = newNode;
+               }
+       }
 }
 
-static void addressbook_write_jpilot( FILE *fp, AddressJPilot *jpilot, guint level ) {
-       JPilotFile *pilotFile = jpilot->pilotFile;
-       if( pilotFile ) {
-               gint ind;
-               GList *node;
-               GList *customLbl = jpilot_get_custom_labels( pilotFile );
-               tab_indent_out(fp, 1);
-               fputs("<jpilot ", fp);
-               fputs("name=\"", fp);
-               xml_file_put_escape_str(fp, pilotFile->name);
-               fputs("\" file=\"", fp);
-               xml_file_put_escape_str(fp, pilotFile->path);
-
-               fputs( "\" ", fp );
-               node = customLbl;
-               ind = 1;
-               while( node ) {
-                       fprintf( fp, "custom-%d=\"", ind );
-                       xml_file_put_escape_str( fp, node->data );
-                       fputs( "\" ", fp );
-                       ind++;
-                       node = g_list_next( node );
+#ifdef USE_JPILOT
+static void addressbook_new_jpilot_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AdapterDSource *ads;
+       AdapterInterface *adapter;
+       AddressInterface *iface;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_JPILOT );
+       if( adapter == NULL ) return;
+       iface = adapter->interface;
+       if( ! iface->haveLibrary ) return;
+       ads = addressbook_edit_jpilot( _addressIndex_, NULL );
+       if( ads ) {
+               newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+               if( newNode ) {
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
+                       addrbook.treeSelected = newNode;
                }
-               fputs("/>\n", fp);
        }
 }
 #endif
 
-static void addressbook_new_vcard_cb( gpointer data, guint action, GtkWidget *widget ) {
-       AddressVCard *vcard;
-
-       if( addrbook.selected != addrbook.vcard ) return;
-       vcard = addressbook_edit_vcard( NULL );
-       if( vcard ) {
-               addressbook_add_object( addrbook.selected, ADDRESS_OBJECT(vcard) );
-               if( addrbook.selected == addrbook.opened ) {
-                       addrbook.open_folder = TRUE;
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
+#ifdef USE_LDAP
+static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AdapterDSource *ads;
+       AdapterInterface *adapter;
+       AddressInterface *iface;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_LDAP );
+       if( adapter == NULL ) return;
+       iface = adapter->interface;
+       if( ! iface->haveLibrary ) return;
+       ads = addressbook_edit_ldap( _addressIndex_, NULL );
+       if( ads ) {
+               newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+               if( newNode ) {
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
+                       addrbook.treeSelected = newNode;
                }
        }
 }
+#endif
 
-static void addressbook_vcard_show_message( VCardFile *vcf ) {
+/**
+ * Display address search status message.
+ * \param queryType Query type.
+ * \param status    Status/Error code.
+ */
+static void addressbook_search_message( gint queryType, gint sts ) {
+       gchar *desc = NULL;
        *addressbook_msgbuf = '\0';
-       if( vcf ) {
-               if( vcf->retVal == MGU_SUCCESS ) {
-                       sprintf( addressbook_msgbuf, "%s", vcf->name );
-               }
-               else {
-                       sprintf( addressbook_msgbuf, "%s: %s", vcf->name, mgu_error2string( vcf->retVal ) );
+
+       if( sts != MGU_SUCCESS ) {
+               if( queryType == ADDRQUERY_LDAP ) {
+#ifdef USE_LDAP                        
+                       desc = addressbook_err2string( _lutErrorsLDAP_, sts );
+#endif
                }
        }
-       addressbook_status_show( addressbook_msgbuf );
+       if( desc ) {
+               g_snprintf( addressbook_msgbuf,
+                       sizeof(addressbook_msgbuf), "%s", desc );
+               addressbook_status_show( addressbook_msgbuf );
+       }
+       else {
+               addressbook_status_show( "" );
+       }
 }
 
-#ifdef USE_JPILOT
-static void addressbook_new_jpilot_cb( gpointer data, guint action, GtkWidget *widget ) {
-       AddressJPilot *jpilot;
+/**
+ * Refresh addressbook by forcing refresh of current selected object in
+ * tree.
+ */
+static void addressbook_refresh_current( void ) {
+       AddressObject *obj;
+       GtkCTree *ctree;
 
-       if( addrbook.selected != addrbook.jpilot ) return;
-       if( ! _have_pilot_library_ ) return;
-       jpilot = addressbook_edit_jpilot( NULL );
-       if( jpilot ) {
-               addressbook_add_object( addrbook.selected, ADDRESS_OBJECT(jpilot) );
-               if( addrbook.selected == addrbook.opened ) {
-                       addrbook.open_folder = TRUE;
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
-               }
-       }
+       ctree = GTK_CTREE(addrbook.ctree);
+       obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+       if( obj == NULL ) return;
+       addressbook_set_clist( obj );
+}
+
+/**
+ * Message that is displayed whilst a query is executing in a background
+ * thread.
+ */
+static gchar *_tempMessage_ = N_( "Busy searching..." );
+
+/**
+ * Address search idle function. This function is called during UI idle time
+ * while a search is in progress.
+ *
+ * \param data Idler data.
+ */
+static void addressbook_search_idle( gpointer data ) {
+       /*
+       gint queryID;
+
+       queryID = GPOINTER_TO_INT( data );
+       printf( "addressbook_ldap_idle... queryID=%d\n", queryID );
+       */
 }
 
-static void addressbook_jpilot_show_message( JPilotFile *jpf ) {
-       *addressbook_msgbuf = '\0';
-       if( jpf ) {
-               if( jpf->retVal == MGU_SUCCESS ) {
-                       sprintf( addressbook_msgbuf, "%s", jpf->name );
-               }
-               else {
-                       sprintf( addressbook_msgbuf, "%s: %s", jpf->name, mgu_error2string( jpf->retVal ) );
-               }
+/**
+ * Search completion callback function. This removes the query from the idle
+ * list.
+ *
+ * \param queryID Query ID of search request.
+ */
+void addressbook_clear_idler( gint queryID ) {
+       gpointer ptrQID;
+
+       /* Remove idler function */
+       /* printf( "addressbook_clear_idler::%d::\n", queryID ); */
+       ptrQID = GINT_TO_POINTER( queryID );
+       if( ptrQID ) {
+               gtk_idle_remove_by_data( ptrQID );
        }
-       addressbook_status_show( addressbook_msgbuf );
 }
 
-#endif
+/**
+ * Search completion callback function. This removes the query from the idle
+ * list.
+ *
+ * \param sender  Sender of query.
+ * \param queryID Query ID of search request.
+ * \param status  Search status.
+ * \param data    Query data.
+ */
+static void addressbook_search_callback_end(
+               gpointer sender, gint queryID, gint status, gpointer data )
+{
+       gpointer ptrQID;
+       QueryRequest *req;
+       AddrQueryObject *aqo;
 
-#ifdef USE_LDAP
-static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *widget ) {
-       AddressLDAP *ldapi;
+       /* Remove idler function */
+       ptrQID = GINT_TO_POINTER( queryID );
+       if( ptrQID ) {
+               gtk_idle_remove_by_data( ptrQID );
+       }
 
-       if( addrbook.selected != addrbook.ldap ) return;
-       if( ! _have_ldap_library_ ) return;
-       ldapi = addressbook_edit_ldap( NULL );
-       if( ldapi ) {
-               addressbook_add_object( addrbook.selected, ADDRESS_OBJECT(ldapi) );
-               if( addrbook.selected == addrbook.opened ) {
-                       addrbook.open_folder = TRUE;
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
-               }
+       /* Refresh addressbook contents */
+       addressbook_refresh_current();
+       req = qrymgr_find_request( queryID );
+       if( req != NULL ) {
+               aqo = ( AddrQueryObject * ) req->queryList->data;
+               addressbook_search_message( aqo->queryType, status );
        }
+
+       /* Stop the search */
+       addrindex_stop_search( queryID );
 }
 
-static AddressLDAP *addressbook_parse_ldap(XMLFile *file) {
-       AddressLDAP *item = NULL;
-       SyldapServer *server;
-       GList *attr;
-       gchar *name, *value;
-       gint ivalue;
+/**
+ * Label (a format string) that is used to name each folder.
+ */
+static gchar *_queryFolderLabel_ = N_( "Search '%s'" );
+
+/**
+ * Perform search.
+ *
+ * \param ds         Data source to search.
+ * \param searchTerm String to lookup.
+ * \param pNode      Parent data source node.
+ */
+static void addressbook_perform_search(
+               AddressDataSource *ds, gchar *searchTerm,
+               GtkCTreeNode *pNode )
+{
+       AddrBookBase *adbase;
+       AddressCache *cache;
+       ItemFolder *folder;
+       GtkCTree *ctree;
+       GtkCTreeNode *nNode;
+       gchar *name;
+       gint queryID;
+       guint idleID;
+       AddressObjectType aoType = ADDR_NONE;
 
-       server = syldap_create();
-       attr = xml_get_current_tag_attr( file );
-       while( attr ) {
-               name = ((XMLAttr *)attr->data)->name;
-               value = ((XMLAttr *)attr->data)->value;
-               ivalue = atoi( value );
-               if( strcmp( name, "name" ) == 0 ) {
-                       syldap_set_name( server, value );
-               }
-               else if( strcmp( name, "host" ) == 0 ) {
-                       syldap_set_host( server, value );
-               }
-               else if( strcmp( name, "port" ) == 0 ) {
-                       syldap_set_port( server, ivalue );
-               }
-               else if( strcmp( name, "base-dn" ) == 0 ) {
-                       syldap_set_base_dn( server, value );
-               }
-               else if( strcmp( name, "bind-dn" ) == 0 ) {
-                       syldap_set_bind_dn( server, value );
-               }
-               else if( strcmp( name, "bind-pass" ) == 0 ) {
-                       syldap_set_bind_password( server, value );
-               }
-               else if( strcmp( name, "criteria" ) == 0 ) {
-                       syldap_set_search_criteria( server, value );
-               }
-               else if( strcmp( name, "max-entry" ) == 0 ) {
-                       syldap_set_max_entries( server, ivalue );
-               }
-               else if( strcmp( name, "timeout" ) == 0 ) {
-                       syldap_set_timeout( server, ivalue );
-               }
-               attr = g_list_next( attr );
-       }
+       /* Setup a query */
+       if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
 
-       // Move to next tag
-       if( xml_parse_next_tag( file ) >= 0 ) {
-               item = g_new( AddressLDAP, 1 );
-               ADDRESS_OBJECT(item)->type = ADDR_LDAP;
-               item->name = g_strdup( server->name );
-               item->ldapServer = server;
-               item->items = NULL;
-               return item;
+       if( ds->type == ADDR_IF_LDAP ) {
+#if USE_LDAP
+               aoType = ADDR_LDAP_QUERY;
+#endif
+       }
+       else {
+               return;
        }
 
-       // Must be an invalid tag or data.
-       g_warning( "addressbook_parse_ldap(): Parse error\n");
-       syldap_free( server );
-       server = NULL;
-       item = NULL;
-       return NULL;
-}
+       /* Get reference to address cache */    
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
 
-static void addressbook_write_ldap( FILE *fp, AddressLDAP *ldapi, guint level ) {
-       SyldapServer *server = ldapi->ldapServer;
-       if( server ) {
-               tab_indent_out(fp, 1);
-               fputs("<server ", fp);
-               fputs("name=\"", fp);
-               xml_file_put_escape_str(fp, server->name);
-               fputs("\" host=\"", fp);
-               xml_file_put_escape_str(fp, server->hostName);
-               fprintf( fp, "\" port=\"%d", server->port);
-               fputs("\" base-dn=\"", fp);
-               xml_file_put_escape_str(fp, server->baseDN);
-               fputs("\" bind-dn=\"", fp);
-               xml_file_put_escape_str(fp, server->bindDN);
-               fputs("\" bind-pass=\"", fp);
-               xml_file_put_escape_str(fp, server->bindPass);
-               fputs("\" criteria=\"", fp);
-               xml_file_put_escape_str(fp, server->searchCriteria);
-               fprintf( fp, "\" max-entry=\"%d", server->maxEntries);
-               fprintf( fp, "\" timeout=\"%d", server->timeOut);
-               fputs("\" />\n", fp);
-       }
-}
-
-static void addressbook_ldap_show_message( SyldapServer *svr ) {
-       *addressbook_msgbuf = '\0';
-       if( svr ) {
-               if( svr->busyFlag ) {
-                       sprintf( addressbook_msgbuf, "%s: %s", svr->name, ADDRESSBOOK_LDAP_BUSYMSG );
-               }
-               else {
-                       if( svr->retVal == MGU_SUCCESS ) {
-                               sprintf( addressbook_msgbuf, "%s", svr->name );
-                       }
-                       else {
-                               sprintf( addressbook_msgbuf, "%s: %s", svr->name, mgu_error2string( svr->retVal ) );
-                       }
-               }
+       /* Create a folder for the search results */
+       folder = addrcache_add_new_folder( cache, NULL );
+       name = g_strdup_printf( _queryFolderLabel_, searchTerm );
+       addritem_folder_set_name( folder, name );
+       addritem_folder_set_remarks( folder, "" );
+       g_free( name );
+
+       /* Now let's see the folder */
+       ctree = GTK_CTREE(addrbook.ctree);
+       nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
+       gtk_ctree_expand( ctree, pNode );
+       if( nNode ) {
+               gtk_sctree_select( GTK_SCTREE(ctree), nNode );
+               addrbook.treeSelected = nNode;
        }
-       addressbook_status_show( addressbook_msgbuf );
+
+       /* Setup the search */
+       queryID = addrindex_setup_explicit_search(
+               ds, searchTerm, folder, addressbook_search_callback_end, NULL );
+       if( queryID == 0 ) return;
+
+       /* Set up idler function */
+       idleID = gtk_idle_add(
+                       ( GtkFunction ) addressbook_search_idle,
+                       GINT_TO_POINTER( queryID ) );
+
+       /* Start search, sit back and wait for something to happen */
+       addrindex_start_search( queryID );
+
+       addressbook_status_show( _tempMessage_ );
 }
 
-static gint ldapsearch_callback( SyldapServer *sls ) {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+/**
+ * Lookup button handler. Address search is only performed against
+ * address interfaces for external queries.
+ *
+ * \param button Lookup button widget.
+ * \param data   Data object.
+ */
+static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
+       GtkCTree *ctree;
        AddressObject *obj;
+       AddressDataSource *ds;
+       AddressInterface *iface;
+       gchar *searchTerm;
+       GtkCTreeNode *node, *parentNode;
 
-       if( sls == NULL ) return;
-       if( ! addrbook.selected ) return;
-       if( GTK_CTREE_ROW( addrbook.selected )->level == 1 ) return;
+       node = addrbook.treeSelected;
+       if( ! node ) return;
+       if( GTK_CTREE_ROW(node)->level == 1 ) return;
 
-       obj = gtk_ctree_node_get_row_data( ctree, addrbook.selected );
+       ctree = GTK_CTREE(addrbook.ctree);
+       obj = gtk_ctree_node_get_row_data( ctree, node );
        if( obj == NULL ) return;
-       if( obj->type == ADDR_LDAP ) {
-                AddressLDAP *ldapi = ADDRESS_LDAP(obj);
-               SyldapServer *server = ldapi->ldapServer;
-               if( server == sls ) {
-                       if( ! _have_ldap_library_ ) return;
-                       // Read from cache
-                       gtk_widget_show_all(addrbook.window);
-                       ADDRESS_LDAP(obj)->items = syldap_get_address_list( sls );
-                       addressbook_set_clist( obj );
-                       addressbook_ldap_show_message( sls );
-                       gtk_widget_show_all(addrbook.window);
-               }
+
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
+
+       /* We must have a datasource that is an external interface */
+       iface = ds->interface;
+       if( ! iface->haveLibrary ) return;
+       if( ! iface->externalQuery ) return;
+
+       searchTerm =
+               gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
+       g_strchomp( searchTerm );
+
+       if( obj->type == ADDR_ITEM_FOLDER ) {
+               parentNode = GTK_CTREE_ROW(node)->parent;
+       }
+       else {
+               parentNode = node;
        }
+       addressbook_perform_search( ds, searchTerm, parentNode );
+       
+       gtk_widget_grab_focus( addrbook.entry );
+
+       g_free( searchTerm );
 }
-#endif
 
-/*
- * Lookup button handler.
+static void addressbook_close_clicked( GtkButton *button, gpointer data ) {
+       addressbook_close();
+}
+
+#ifdef USE_LDAP
+/**
+ * Browse address entry for highlighted entry.
  */
-static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+static void addressbook_browse_entry_cb(void)
+{
+       GtkCTree *clist = GTK_CTREE(addrbook.clist);
        AddressObject *obj;
-       gchar *sLookup;
-#ifdef USE_LDAP
-       AddressLDAP *ldapi;
-       SyldapServer *server;
-#endif
+       AddressDataSource *ds;
+       AddressInterface *iface;
+       ItemPerson *person;
+       ItemEMail *email;
+
+       if(addrbook.listSelected == NULL)
+               return;
 
-       sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
-       g_strchomp( sLookup );
+       obj = gtk_ctree_node_get_row_data(clist, addrbook.listSelected);
+       if (obj == NULL)
+               return;
 
-       if( ! addrbook.selected ) return;
-       if( GTK_CTREE_ROW( addrbook.selected )->level == 1 ) return;
+       ds = addressbook_find_datasource(GTK_CTREE_NODE(addrbook.treeSelected));
+       if(ds == NULL)
+               return;
 
-       obj = gtk_ctree_node_get_row_data( ctree, addrbook.selected );
-       if( obj == NULL ) return;
+       iface = ds->interface;
+       if(! iface->haveLibrary )
+               return;
 
-#ifdef USE_LDAP
-       if( obj->type == ADDR_LDAP ) {
-               ldapi = ADDRESS_LDAP(obj);
-               server = ldapi->ldapServer;
-               if( server ) {
-                       if( ! _have_ldap_library_ ) return;
-                       syldap_cancel_read( server );
-                       if( *sLookup == '\0' || strlen( sLookup ) < 1 ) return;
-                       syldap_set_search_value( server, sLookup );
-                       syldap_set_callback( server, ldapsearch_callback );
-                       syldap_read_data_th( server );
-                       addressbook_ldap_show_message( server );
-               }
+       person = NULL;
+       if (obj->type == ADDR_ITEM_EMAIL) {
+               email = ( ItemEMail * ) obj;
+               if (email == NULL)
+                       return;
+               
+               person = (ItemPerson *) ADDRITEM_PARENT(email);
+       }
+       else if (obj->type == ADDR_ITEM_PERSON) {
+               person = (ItemPerson *) obj;
        }
+       else {
+               /* None of these */
+               return;
+       }
+
+       if( iface->type == ADDR_IF_LDAP ) {
+               browseldap_entry(ds, person->externalID);
+       }
+}
 #endif
 
+/* **********************************************************************
+* Build lookup tables.
+* ***********************************************************************
+*/
+
+/*
+ * Remap object types.
+ * Enter:  abType AddressObjectType (used in tree node).
+ * Return: ItemObjectType (used in address cache data).
+ */
+ItemObjectType addressbook_type2item( AddressObjectType abType ) {
+       ItemObjectType ioType;
+
+       switch( abType ) {
+               case ADDR_ITEM_PERSON: ioType = ITEMTYPE_PERSON;     break;
+               case ADDR_ITEM_EMAIL:  ioType = ITEMTYPE_EMAIL;      break;
+               case ADDR_ITEM_FOLDER: ioType = ITEMTYPE_FOLDER;     break;
+               case ADDR_ITEM_GROUP:  ioType = ITEMTYPE_GROUP;      break;
+               case ADDR_DATASOURCE:  ioType = ITEMTYPE_DATASOURCE; break;
+               default:               ioType = ITEMTYPE_NONE;       break;
+       }
+       return ioType;
 }
 
-/***/
+/*
+* Build table that controls the rendering of object types.
+*/
+void addrbookctl_build_map( GtkWidget *window ) {
+       AddressTypeControlItem *atci;
+
+       /* Build icons */
+       stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm, &groupxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm, &vcardxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm, &bookxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm, &addressxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm, &jpilotxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm, &categoryxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm, &ldapxpmmask);
+       stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm, &addrsearchxpmmask);
+
+       _addressBookTypeHash_ = g_hash_table_new( g_int_hash, g_int_equal );
+       _addressBookTypeList_ = NULL;
+
+       /* Interface */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_INTERFACE;
+       atci->interfaceType = ADDR_IF_NONE;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "Interface" );
+       atci->iconXpm = folderxpm;
+       atci->maskXpm = folderxpmmask;
+       atci->iconXpmOpen = folderopenxpm;
+       atci->maskXpmOpen = folderopenxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Address book */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_BOOK;
+       atci->interfaceType = ADDR_IF_BOOK;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "Address Book" );
+       atci->iconXpm = bookxpm;
+       atci->maskXpm = bookxpmmask;
+       atci->iconXpmOpen = bookxpm;
+       atci->maskXpmOpen = bookxpmmask;
+       atci->menuCommand = "/Book/New Book";
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Item person */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_ITEM_PERSON;
+       atci->interfaceType = ADDR_IF_NONE;
+       atci->showInTree = FALSE;
+       atci->treeExpand = FALSE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "Person" );
+       atci->iconXpm = NULL;
+       atci->maskXpm = NULL;
+       atci->iconXpmOpen = NULL;
+       atci->maskXpmOpen = NULL;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Item email */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_ITEM_EMAIL;
+       atci->interfaceType = ADDR_IF_NONE;
+       atci->showInTree = FALSE;
+       atci->treeExpand = FALSE;
+       atci->treeLeaf = TRUE;
+       atci->displayName = _( "EMail Address" );
+       atci->iconXpm = addressxpm;
+       atci->maskXpm = addressxpmmask;
+       atci->iconXpmOpen = addressxpm;
+       atci->maskXpmOpen = addressxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Item group */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_ITEM_GROUP;
+       atci->interfaceType = ADDR_IF_BOOK;
+       atci->showInTree = TRUE;
+       atci->treeExpand = FALSE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "Group" );
+       atci->iconXpm = groupxpm;
+       atci->maskXpm = groupxpmmask;
+       atci->iconXpmOpen = groupxpm;
+       atci->maskXpmOpen = groupxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Item folder */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_ITEM_FOLDER;
+       atci->interfaceType = ADDR_IF_BOOK;
+       atci->showInTree = TRUE;
+       atci->treeExpand = FALSE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "Folder" );
+       atci->iconXpm = folderxpm;
+       atci->maskXpm = folderxpmmask;
+       atci->iconXpmOpen = folderopenxpm;
+       atci->maskXpmOpen = folderopenxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* vCard */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_VCARD;
+       atci->interfaceType = ADDR_IF_VCARD;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = TRUE;
+       atci->displayName = _( "vCard" );
+       atci->iconXpm = vcardxpm;
+       atci->maskXpm = vcardxpmmask;
+       atci->iconXpmOpen = vcardxpm;
+       atci->maskXpmOpen = vcardxpmmask;
+       atci->menuCommand = "/Book/New vCard";
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* J-Pilot */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_JPILOT;
+       atci->interfaceType = ADDR_IF_JPILOT;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "JPilot" );
+       atci->iconXpm = jpilotxpm;
+       atci->maskXpm = jpilotxpmmask;
+       atci->iconXpmOpen = jpilotxpm;
+       atci->maskXpmOpen = jpilotxpmmask;
+       atci->menuCommand = "/Book/New JPilot";
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* Category */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_CATEGORY;
+       atci->interfaceType = ADDR_IF_JPILOT;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = TRUE;
+       atci->displayName = _( "JPilot" );
+       atci->iconXpm = categoryxpm;
+       atci->maskXpm = categoryxpmmask;
+       atci->iconXpmOpen = categoryxpm;
+       atci->maskXpmOpen = categoryxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* LDAP Server */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_LDAP;
+       atci->interfaceType = ADDR_IF_LDAP;
+       atci->showInTree = TRUE;
+       atci->treeExpand = TRUE;
+       atci->treeLeaf = FALSE;
+       atci->displayName = _( "LDAP Server" );
+       atci->iconXpm = ldapxpm;
+       atci->maskXpm = ldapxpmmask;
+       atci->iconXpmOpen = ldapxpm;
+       atci->maskXpmOpen = ldapxpmmask;
+       atci->menuCommand = "/Book/New Server";
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
+       /* LDAP Query  */
+       atci = g_new0( AddressTypeControlItem, 1 );
+       atci->objectType = ADDR_LDAP_QUERY;
+       atci->interfaceType = ADDR_IF_LDAP;
+       atci->showInTree = TRUE;
+       atci->treeExpand = FALSE;
+       atci->treeLeaf = TRUE;
+       atci->displayName = _( "LDAP Query" );
+       atci->iconXpm = addrsearchxpm;
+       atci->maskXpm = addrsearchxpmmask;
+       atci->iconXpmOpen = addrsearchxpm;
+       atci->maskXpmOpen = addrsearchxpmmask;
+       atci->menuCommand = NULL;
+       g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+       _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
 
-typedef struct {
-       gboolean                init;                   /* if FALSE should init jump buffer */
-       GtkCTreeNode   *node_found;             /* match (can be used to backtrack folders)  */
-       AddressObject  *addr_found;             /* match */
-       int                             level;                  /* current recursion level (0 is root level) */
-       jmp_buf                 jumper;                 /* jump buffer */
-} FindObject;
+}
 
-typedef struct {
-       FindObject              ancestor;
-       const gchar        *groupname;
-} FindGroup;
+/*
+* Search for specified object type.
+*/
+AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
+       gint objType = ot;
+       return ( AddressTypeControlItem * ) g_hash_table_lookup( _addressBookTypeHash_, &objType );
+}
 
-typedef struct {
-       FindObject              ancestor;
-       const gchar    *name;
-       const gchar    *address;
-} FindAddress;
+/*
+* Search for specified interface type.
+*/
+AddressTypeControlItem *addrbookctl_lookup_iface( AddressIfType ifType ) {
+       GList *node = _addressBookTypeList_;
+       while( node ) {
+               AddressTypeControlItem *atci = node->data;
+               if( atci->interfaceType == ifType ) return atci;
+               node = g_list_next( node );
+       }
+       return NULL;
+}
 
-typedef struct {
-       FindObject              ancestor;
-       GList              *grouplist;
-} FindAllGroups;
+static void addrbookctl_free_address( AddressObject *obj ) {
+       g_free( obj->name );
+       obj->type = ADDR_NONE;
+       obj->name = NULL;
+}
 
-typedef gboolean (*ADDRESSBOOK_TRAVERSE_FUNC)(AddressObject *node, gpointer data);
+static void addrbookctl_free_interface( AdapterInterface *adapter ) {
+       addrbookctl_free_address( ADDRESS_OBJECT(adapter) );
+       adapter->interface = NULL;
+       adapter->interfaceType = ADDR_IF_NONE;
+       adapter->atci = NULL;
+       adapter->enabled = FALSE;
+       adapter->haveLibrary = FALSE;
+       adapter->treeNode = NULL;
+       g_free( adapter );
+}
 
-/***/
+static void addrbookctl_free_datasource( AdapterDSource *adapter ) {
+       addrbookctl_free_address( ADDRESS_OBJECT(adapter) );
+       adapter->dataSource = NULL;
+       adapter->subType = ADDR_NONE;
+       g_free( adapter );
+}
 
-static gboolean traverse_find_group_by_name(AddressObject *ao, FindGroup *find)
-{
-       AddressFolder *folder;
-       AddressGroup  *group;
+static void addrbookctl_free_folder( AdapterFolder *adapter ) {
+       addrbookctl_free_address( ADDRESS_OBJECT(adapter) );
+       adapter->itemFolder = NULL;
+       g_free( adapter );
+}
 
-       /* a group or folder: both are groups */
-       if (ADDRESS_OBJECT_TYPE(ao) == ADDR_GROUP) {
-               group = ADDRESS_GROUP(ao);
-               if (0 == g_strcasecmp(group->name, find->groupname)) {
-                       return TRUE;
-               }
-       }
-       else if (ADDRESS_OBJECT_TYPE(ao) == ADDR_FOLDER) {
-               folder = ADDRESS_FOLDER(ao);
-               if (0 == g_strcasecmp(folder->name, find->groupname)) {
-                       return TRUE;
-               }
-       }
-       return FALSE;
+static void addrbookctl_free_group( AdapterGroup *adapter ) {
+       addrbookctl_free_address( ADDRESS_OBJECT(adapter) );
+       adapter->itemGroup = NULL;
+       g_free( adapter );
 }
 
-static gboolean traverse_find_name_email(AddressObject *ao, FindAddress *find)
-{
-       AddressItem *item;
-       if (ADDRESS_OBJECT_TYPE(ao) == ADDR_ITEM) {
-               gboolean nmatch = FALSE, amatch = FALSE;
-               item = ADDRESS_ITEM(ao);
-               /* conditions:
-                * o only match at the first characters in item strings 
-                * o match either name or address */
-               if (find->name && item->name) {
-                       nmatch = item->name == strcasestr(item->name, find->name);
+/**
+ * Build GUI interface list.
+ */
+void addrbookctl_build_iflist( void ) {
+       AddressTypeControlItem *atci;
+       AdapterInterface *adapter;
+       GList *list = NULL;
+
+       if( _addressIndex_ == NULL ) {
+               _addressIndex_ = addrindex_create_index();
+               if( _clipBoard_ == NULL ) {
+                       _clipBoard_ = addrclip_create();
                }
-               if (find->address && item->address) {
-                       amatch = item->address == strcasestr(item->address, find->address);
+               addrclip_set_index( _clipBoard_, _addressIndex_ );
+       }
+       _addressInterfaceList_ = NULL;
+       list = addrindex_get_interface_list( _addressIndex_ );
+       while( list ) {
+               AddressInterface *interface = list->data;
+               atci = addrbookctl_lookup_iface( interface->type );
+               if( atci ) {
+                       adapter = g_new0( AdapterInterface, 1 );
+                       adapter->interfaceType = interface->type;
+                       adapter->atci = atci;
+                       adapter->interface = interface;
+                       adapter->treeNode = NULL;
+                       adapter->enabled = TRUE;
+                       adapter->haveLibrary = interface->haveLibrary;
+                       ADDRESS_OBJECT(adapter)->type = ADDR_INTERFACE;
+                       ADDRESS_OBJECT_NAME(adapter) = g_strdup( atci->displayName );
+                       _addressInterfaceList_ =
+                               g_list_append( _addressInterfaceList_, adapter );
                }
-               return nmatch || amatch;
+               list = g_list_next( list );
        }
-       return FALSE;
 }
 
-static gboolean traverse_find_all_groups(AddressObject *ao, FindAllGroups *find)
-{
-       /* NOTE: added strings come from the address book. should perhaps 
-        * strdup() them, especially if the address book is invalidated */
-       if (ADDRESS_OBJECT_TYPE(ao) == ADDR_FOLDER) {
-               AddressFolder *folder = ADDRESS_FOLDER(ao);
-               find->grouplist = g_list_insert_sorted(find->grouplist, (gpointer) folder->name, (GCompareFunc) g_strcasecmp);
-       }
-       else if (ADDRESS_OBJECT_TYPE(ao) == ADDR_GROUP) {
-               AddressGroup *group = ADDRESS_GROUP(ao);
-               find->grouplist = g_list_insert_sorted(find->grouplist, (gpointer) group->name, (GCompareFunc) g_strcasecmp);
-       }
-       return FALSE;
+#if 0
+void addrbookctl_free_selection( GList *list ) {
+       GList *node = list;
+       while( node ) {
+               AdapterInterface *adapter = node->data;
+               adapter = NULL;
+               node = g_list_next( node );
+       }
+       g_list_free( list );
 }
+#endif
 
-/* addressbook_traverse() - traverses all address objects stored in the address book. 
- * for some reason gtkctree's recursive tree functions don't allow a premature return, 
- * which is what we need if we need to enumerate the tree and check for a condition 
- * and then skipping other nodes. */ 
-static AddressObject *addressbook_traverse(GtkCTreeNode *node, ADDRESSBOOK_TRAVERSE_FUNC func, FindObject *data, int level)
-{
-       GtkCTreeNode  *current, *tmp;
-       AddressObject *ao;
-
-       if (data->init == FALSE) {
-               /* initialize non-local exit */
-               data->init  = TRUE;
-               data->level = 0;
-               /* HANDLE NON-LOCAL EXIT */
-               if (setjmp(data->jumper)) {
-                       return data->addr_found;
-               }
+/**
+ * Find GUI interface type specified interface type.
+ * \param  ifType Interface type.
+ * \return Interface item, or NULL if not found.
+ */
+AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
+       GList *node = _addressInterfaceList_;
+       while( node ) {
+               AdapterInterface *adapter = node->data;
+               if( adapter->interfaceType == ifType ) return adapter;
+               node = g_list_next( node );
        }
+       return NULL;
+}
 
-       /* actual recursive code */
-       if (!node) {
-               current = GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list);
-       }
-       else {
-               current = node;
-       }
-
-       while (current) {
-               tmp = GTK_CTREE_ROW(current)->sibling;
-               ao = (AddressObject *) gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), current);
-               if (ao) {
-                       GList *next;
-
-                       next = (ADDRESS_OBJECT_TYPE(ao) == ADDR_FOLDER) ? 
-                                  g_list_first(((ADDRESS_FOLDER(ao))->items)) :
-                                  (ADDRESS_OBJECT_TYPE(ao)  == ADDR_GROUP) ?
-                                  g_list_first(((ADDRESS_GROUP(ao))->items))  : NULL;
-
-                       while (ao) {
-                               /* NOTE: first iteration of the root calls callback for the tree 
-                                * node, other iterations call callback for the address book items */
-                               if (func(ao, data)) {
-                                       /* unwind */
-                                       data->node_found = current;
-                                       data->addr_found = ao;
-                                       longjmp(data->jumper, 1);
+/**
+ * Build interface list selection.
+ */
+void addrbookctl_build_ifselect( void ) {
+       GList *newList = NULL;
+       gchar *selectStr;
+       gchar **splitStr;
+       gint ifType;
+       gint i;
+       gchar *endptr = NULL;
+       gboolean enabled;
+       AdapterInterface *adapter;
+
+       selectStr = g_strdup( ADDRESSBOOK_IFACE_SELECTION );
+
+       /* Parse string */
+       splitStr = g_strsplit( selectStr, ",", -1 );
+       for( i = 0; i < ADDRESSBOOK_MAX_IFACE; i++ ) {
+               if( splitStr[i] ) {
+                       /* printf( "%d : %s\n", i, splitStr[i] ); */
+                       ifType = strtol( splitStr[i], &endptr, 10 );
+                       enabled = TRUE;
+                       if( *endptr ) {
+                               if( strcmp( endptr, "/n" ) == 0 ) {
+                                       enabled = FALSE;
                                }
-                               /* ctree node only stores folders and groups. now descend into
-                                * address object data, searching for address items. */
-                               for ( ; next && ADDRESS_OBJECT_TYPE((next->data)) != ADDR_ITEM
-                                         ; next = g_list_next(next))
-                                       ;                       
-                               ao   = next ? (AddressObject *) next->data : NULL;
-                               next = next ? g_list_next(next) : NULL;
-                       }                               
-               }
-               /* check the children (if level permits) */
-               if (level == -1 || data->level < level) {
-                       current = GTK_CTREE_ROW(current)->children;
-                       if (current) {
-                               data->level++;
-                               addressbook_traverse(current, func, data, level);
-                               data->level--;
-                       }                       
-               }                       
-               /* check the siblings */
-               current = tmp;
+                       }
+                       /* printf( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
+                       adapter = addrbookctl_find_interface( ifType );
+                       if( adapter ) {
+                               newList = g_list_append( newList, adapter );
+                       }
+               }
+               else {
+                       break;
+               }
        }
-       return NULL;
-}
+       /* printf( "i=%d\n", i ); */
+       g_strfreev( splitStr );
+       g_free( selectStr );
 
-static GtkCTreeNode *addressbook_get_group_node(const gchar *name)
-{
-       FindGroup fg = { { FALSE, NULL, NULL }, NULL };
-       fg.groupname = name;
-       addressbook_traverse(NULL, (void *)traverse_find_group_by_name, (FindObject *)&fg, -1);
-       return fg.ancestor.node_found;
+       /* Replace existing list */
+       mgu_clear_list( _addressIFaceSelection_ );
+       g_list_free( _addressIFaceSelection_ );
+       _addressIFaceSelection_ = newList;
+       newList = NULL;
 }
 
-static void addressbook_free_item(AddressItem *item)
+/* ***********************************************************************
+ * Add sender to address book.
+ * ***********************************************************************
+ */
+
+/*
+ * This function is used by the Add sender to address book function.
+ */
+gboolean addressbook_add_contact(
+               const gchar *name, const gchar *address, const gchar *remarks )
 {
-       if (item) {
-               if (item->name) g_free(item->name);
-               if (item->address) g_free(item->address);
-               if (item->remarks) g_free(item->remarks);
-               g_free(item);
+       debug_print( "addressbook_add_contact: name/address: %s - %s\n", name, address );
+       if( addressadd_selection( _addressIndex_, name, address, remarks ) ) {
+               debug_print( "addressbook_add_contact - added\n" );
+               addressbook_refresh();
        }
+       return TRUE;
 }
 
-static AddressItem *addressbook_alloc_item(const gchar *name, const gchar *address, const gchar *remarks)
-{
-       AddressItem *item = g_new0(AddressItem, 1);
-       
-       if (item) {
-               item->obj.type = ADDR_ITEM;
-               if (item->name = g_strdup(name))
-                       if (item->address = g_strdup(address)) {
-                               if (remarks) {
-                                       item->remarks = g_strdup(remarks);
+/* **********************************************************************
+ * Address Import.
+ * ***********************************************************************
+ */
+
+/**
+ * Import LDIF file.
+ */
+static void addressbook_import_ldif_cb( void ) {
+       AddressDataSource *ds = NULL;
+       AdapterDSource *ads = NULL;
+       AddressBookFile *abf = NULL;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+       if( adapter ) {
+               if( adapter->treeNode ) {
+                       abf = addressbook_imp_ldif( _addressIndex_ );
+                       if( abf ) {
+                               ds = addrindex_index_add_datasource(
+                                       _addressIndex_, ADDR_IF_BOOK, abf );
+                               ads = addressbook_create_ds_adapter(
+                                       ds, ADDR_BOOK, NULL );
+                               addressbook_ads_set_name(
+                                       ads, addrbook_get_name( abf ) );
+                               newNode = addressbook_add_object(
+                                       adapter->treeNode,
+                                       ADDRESS_OBJECT(ads) );
+                               if( newNode ) {
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
+                                               newNode );
+                                       addrbook.treeSelected = newNode;
                                }
-                               return item;
+
+                               /* Notify address completion */
+                               invalidate_address_completion();
                        }
+               }
        }
-       addressbook_free_item(item);
-       return NULL;
 }
 
-/***/
-
-/* public provisional API */
+/**
+ * Import MUTT file.
+ */
+static void addressbook_import_mutt_cb( void ) {
+       AddressDataSource *ds = NULL;
+       AdapterDSource *ads = NULL;
+       AddressBookFile *abf = NULL;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+       if( adapter ) {
+               if( adapter->treeNode ) {
+                       abf = addressbook_imp_mutt( _addressIndex_ );
+                       if( abf ) {
+                               ds = addrindex_index_add_datasource(
+                                       _addressIndex_, ADDR_IF_BOOK, abf );
+                               ads = addressbook_create_ds_adapter(
+                                       ds, ADDR_BOOK, NULL );
+                               addressbook_ads_set_name(
+                                       ads, addrbook_get_name( abf ) );
+                               newNode = addressbook_add_object(
+                                       adapter->treeNode,
+                                       ADDRESS_OBJECT(ads) );
+                               if( newNode ) {
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
+                                               newNode );
+                                       addrbook.treeSelected = newNode;
+                               }
 
-/* addressbook_access() - should be called before using any of the following apis. it
- * reloads the address book. */
-void addressbook_access(void)
-{
-       log_message("accessing address book\n");
-       if (!addrbook.window) {
-               addressbook_create(FALSE);
-               addressbook_read_file();
-               addrbook.open_folder = TRUE;
-               gtk_ctree_select(GTK_CTREE(addrbook.ctree), GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
-       } 
+                               /* Notify address completion */
+                               invalidate_address_completion();
+                       }
+               }
+       }
 }
 
-/* addressbook_unaccess() - should only be called after changing the address book's
- * contents */
-void addressbook_unaccess(void)
-{
-       log_message("unaccessing address book\n");
-       addressbook_export_to_file();
-       invalidate_address_completion();
-}
+/**
+ * Import Pine file.
+ */
+static void addressbook_import_pine_cb( void ) {
+       AddressDataSource *ds = NULL;
+       AdapterDSource *ads = NULL;
+       AddressBookFile *abf = NULL;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+       if( adapter ) {
+               if( adapter->treeNode ) {
+                       abf = addressbook_imp_pine( _addressIndex_ );
+                       if( abf ) {
+                               ds = addrindex_index_add_datasource(
+                                       _addressIndex_, ADDR_IF_BOOK, abf );
+                               ads = addressbook_create_ds_adapter(
+                                       ds, ADDR_BOOK, NULL );
+                               addressbook_ads_set_name(
+                                       ads, addrbook_get_name( abf ) );
+                               newNode = addressbook_add_object(
+                                       adapter->treeNode,
+                                       ADDRESS_OBJECT(ads) );
+                               if( newNode ) {
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
+                                               newNode );
+                                       addrbook.treeSelected = newNode;
+                               }
 
-const gchar *addressbook_get_personal_folder_name(void)
-{
-       return _("Personal addresses"); /* human readable */
+                               /* Notify address completion */
+                               invalidate_address_completion();
+                       }
+               }
+       }
 }
 
-const gchar *addressbook_get_common_folder_name(void)
+/**
+ * Harvest addresses.
+ * \param folderItem Folder to import.
+ * \param sourceInd  Source indicator: FALSE - Folder, TRUE - Messages.
+ * \param msgList    List of message numbers, or NULL to process folder.
+ */
+void addressbook_harvest(
+       FolderItem *folderItem, gboolean sourceInd, GList *msgList )
 {
-       return _("Common addresses"); /* human readable */
+       AddressDataSource *ds = NULL;
+       AdapterDSource *ads = NULL;
+       AddressBookFile *abf = NULL;
+       AdapterInterface *adapter;
+       GtkCTreeNode *newNode;
+
+       abf = addrgather_dlg_execute(
+               folderItem, _addressIndex_, sourceInd, msgList );
+       if( abf ) {
+               ds = addrindex_index_add_datasource(
+                       _addressIndex_, ADDR_IF_BOOK, abf );
+
+               adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+               if( adapter ) {
+                       if( adapter->treeNode ) {
+                               ads = addressbook_create_ds_adapter(
+                                       ds, ADDR_BOOK, addrbook_get_name( abf ) );
+                               newNode = addressbook_add_object(
+                                               adapter->treeNode,
+                                               ADDRESS_OBJECT(ads) );
+                       }
+               }
+
+               /* Notify address completion */
+               invalidate_address_completion();
+       }
 }
 
-/* addressbook_find_group_by_name() - finds a group (folder or group) by
- * its name */
-AddressObject *addressbook_find_group_by_name(const gchar *name)
-{
-       FindGroup          fg = { { FALSE, NULL, NULL } };
-       AddressObject *ao;
+/**
+ * Export HTML file.
+ */
+static void addressbook_export_html_cb( void ) {
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       AddressObject *obj;
+       AddressDataSource *ds = NULL;
+       AddrBookBase *adbase;
+       AddressCache *cache;
+       GtkCTreeNode *node = NULL;
+
+       if( ! addrbook.treeSelected ) return;
+       node = addrbook.treeSelected;
+       if( GTK_CTREE_ROW(node)->level == 1 ) return;
+       obj = gtk_ctree_node_get_row_data( ctree, node );
+       if( obj == NULL ) return;
 
-       /* initialize obj members */
-       fg.groupname = name;
-       ao = addressbook_traverse(NULL, 
-                                                         (ADDRESSBOOK_TRAVERSE_FUNC)traverse_find_group_by_name, 
-                                                         (FindObject *)&fg, -1);
-       return ao;
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
+       addressbook_exp_html( cache );
 }
 
-/* addressbook_find_contact() - finds an address item by either name or address
- * or both. the comparison is done on the first few characters of the strings */
-AddressObject *addressbook_find_contact(const gchar *name, const gchar *address)
-{
-       FindAddress   fa = { { FALSE, NULL, NULL } };
-       AddressObject *ao;
+/**
+ * Export LDIF file.
+ */
+static void addressbook_export_ldif_cb( void ) {
+       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+       AddressObject *obj;
+       AddressDataSource *ds = NULL;
+       AddrBookBase *adbase;
+       AddressCache *cache;
+       GtkCTreeNode *node = NULL;
+
+       if( ! addrbook.treeSelected ) return;
+       node = addrbook.treeSelected;
+       if( GTK_CTREE_ROW(node)->level == 1 ) return;
+       obj = gtk_ctree_node_get_row_data( ctree, node );
+       if( obj == NULL ) return;
 
-       fa.name = name;
-       fa.address = address;
-       ao = addressbook_traverse(NULL, (ADDRESSBOOK_TRAVERSE_FUNC)traverse_find_name_email,
-                                                         (FindObject *)&fa, -1);
-       return ao;                                                        
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
+       addressbook_exp_ldif( cache );
 }
 
-/* addressbook_get_group_list() - returns a list of strings with group names (both
- * groups and folders). free the list using g_list_free(). note that another
- * call may invalidate the returned list */
-GList *addressbook_get_group_list(void)
+static void addressbook_start_drag(GtkWidget *widget, gint button, 
+                                  GdkEvent *event,
+                                  void *data)
 {
-       FindAllGroups fag = { { FALSE, NULL, NULL }, NULL };
-       addressbook_traverse(NULL, (ADDRESSBOOK_TRAVERSE_FUNC)traverse_find_all_groups,
-                                                (FindObject *)&fag, -1);
-       return fag.grouplist;
+       GdkDragContext *context;
+       if (addressbook_target_list == NULL)
+               addressbook_target_list = gtk_target_list_new(
+                               addressbook_drag_types, 1);
+       context = gtk_drag_begin(widget, addressbook_target_list,
+                                GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
+       gtk_drag_set_icon_default(context);
 }
 
-/* addressbook_add_contact() - adds a contact to the address book. returns 1
- * if succesful else error */
-gint addressbook_add_contact(const gchar *group, const gchar *name, const gchar *address,
-                                                        const gchar *remarks) 
-{
-       GtkCTreeNode *node;
-       AddressItem *item;
-       FindAddress  fa = { { FALSE, NULL, NULL } };
+static GSList *dragged_persons = NULL;
+static ItemFolder *dragged_folder = NULL;
+static AddressBookFile *dragged_ab = NULL;
 
-       /* a healthy mix of hiro's and my code */
-       if (name == NULL || strlen(name) == 0
-       ||  address == NULL || strlen(address) == 0
-       ||  group == NULL || strlen(group) == 0) {
-               return __LINE__;
-       }
-       node = addressbook_get_group_node(group);
-       if (!node) {
-               return __LINE__;
-       }
+static void addressbook_drag_data_get(GtkWidget        *widget,
+                                    GdkDragContext   *drag_context,
+                                    GtkSelectionData *selection_data,
+                                    guint             info,
+                                    guint             time,
+                                    void             *data)
+{
+       AddrItemObject *aio = NULL;
+       AddressObject *pobj = NULL;
+       AdapterDSource *ads = NULL;
+       AddressDataSource *ds = NULL;
+       GList *cur;
 
-       /* check if it's already in this group */
-       fa.name = name;
-       fa.address = address;
+       pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       if( pobj == NULL ) return;
 
-       if (addressbook_traverse(node, (gpointer)traverse_find_name_email, (gpointer)&fa, 0)) {
-               log_message("address <%s> already in %s\n", address, group);
-               return __LINE__;
+       if( pobj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(pobj);
+               ds = ads->dataSource;
+       } else if (pobj->type == ADDR_ITEM_GROUP) {
+               return;
        }
-
-       item = addressbook_alloc_item(name, address, remarks);
-       if (!item) {
-               return __LINE__;
+       
+       else if( pobj->type != ADDR_INTERFACE ) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               if (!ds)
+                       return;
        }
+       
 
-       if (!addressbook_add_object(node, (AddressObject *)item)) {
-               addressbook_free_item(item);
-               return __LINE__;
+       for(cur = GTK_CLIST(addrbook.clist)->selection; cur; cur = cur->next) {
+               aio = (AddrItemObject *)gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.clist), 
+                       GTK_CTREE_NODE(cur->data));
+               while (aio && aio->type != ADDR_ITEM_PERSON) {
+                       aio = aio->parent;
+               }
+               if (aio) {
+                       dragged_persons = g_slist_append(dragged_persons, aio);
+               }
        }
 
-       /* make sure it's updated if selected */
-       log_message("updating addressbook widgets\n");
-       addrbook.open_folder = TRUE;
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
-
-       /* not saved yet. only after unaccessing the address book */
-       return 0;
+       if (aio && aio->type == ADDR_ITEM_PERSON) {
+               dragged_folder = (ItemFolder *)ADAPTER_FOLDER(pobj)->itemFolder;
+               dragged_ab = addressbook_get_book_file();
+
+               gtk_selection_data_set(selection_data,
+                                      selection_data->target, 8,
+                                      "Dummy_addr", 11);
+               drag_context->actions = GDK_ACTION_MOVE;
+               
+               if (pobj->type == ADDR_DATASOURCE) {
+                       if( ds != NULL) {
+                               dragged_folder = addrindex_ds_get_root_folder( ds );
+                               if (ds->type != ADDR_IF_JPILOT ||
+                                   ds->type != ADDR_IF_LDAP)
+                                   drag_context->action = GDK_ACTION_COPY;
+                       } else {
+                               dragged_folder = NULL;
+                               g_slist_free(dragged_persons);
+                               dragged_persons = NULL;
+                               dragged_ab = NULL;
+                       }
+               }
+       } else {
+               dragged_folder = NULL;
+               g_slist_free(dragged_persons);
+               dragged_persons = NULL;
+               dragged_ab = NULL;
+       }
 }
 
-static void group_object_data_destroy(gchar *group)
+static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
+                                         GdkDragContext *context,
+                                         gint            x,
+                                         gint            y,
+                                         guint           time,
+                                         void            *data)
 {
-       if (group) {
-               g_free(group);
-       }               
-}
+       gint row, column;
+       GtkCTreeNode *node = NULL;
+       gboolean acceptable = FALSE;
+       gint height = addrbook.ctree->allocation.height;
+       gint total_height = addrbook.ctree->requisition.height;
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(addrbook.ctree_swin));
+       gfloat vpos = pos->value;
+       
+       if (gtk_clist_get_selection_info
+               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
 
-/***/
+               if (y > height - 24 && height + vpos < total_height)
+                       gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
 
-typedef struct {
-       gchar *name;
-       gchar *address;
-       gchar *remarks;
-} ContactInfo;
+               if (y < 24 && y > 0)
+                       gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
 
-static void addressbook_destroy_contact(ContactInfo *ci)
-{
-       g_return_if_fail(ci != NULL);
-       if (ci->name) g_free(ci->name);
-       if (ci->address) g_free(ci->address);
-       if (ci->remarks) g_free(ci->remarks);
-       g_free(ci);
-}
+               node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+
+               if (node != NULL) {
+                       AddressObject *obj = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node );
+                       if( obj->type == ADDR_ITEM_FOLDER 
+                       || obj->type == ADDR_ITEM_GROUP)
+                               acceptable = TRUE;
+                       else {
+                               AdapterDSource *ads = NULL;
+                               AddressDataSource *ds = NULL;
+                               ads = ADAPTER_DSOURCE(obj);
+                               if (ads == NULL ) return FALSE;
+                               ds = ads->dataSource;
+                               if (ds == NULL ) return FALSE;
+                               if (obj->type == ADDR_DATASOURCE
+                               &&  !ds->interface->externalQuery)
+                                       acceptable = TRUE;
+
+                       }
+               }
+       }
 
-static ContactInfo *addressbook_new_contact(const gchar *name, const gchar *address, const gchar *remarks)
-{
-       ContactInfo *ci = g_new0(ContactInfo, 1);
        
-       g_return_val_if_fail(ci != NULL, NULL);
-       g_return_val_if_fail(address != NULL, NULL); /* address should be valid */
-       ci->name    = name ? g_strdup(name) : NULL;
-       ci->address = g_strdup(address);
-       ci->remarks = remarks ? g_strdup(remarks) : NULL;
-       if (NULL == ci->address) {
-               addressbook_destroy_contact(ci);
-               ci = NULL;
+       if (acceptable) {
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+               gtk_sctree_select( GTK_SCTREE(widget), node);
+               g_signal_handlers_unblock_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+               gdk_drag_status(context, 
+                                       (context->actions == GDK_ACTION_COPY ?
+                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
+       } else {
+               gdk_drag_status(context, 0, time);
        }
-       return ci;
+
+       return acceptable;
 }
 
-static void addressbook_group_menu_selected(GtkMenuItem *menuitem,
-                                                                                       ContactInfo *data)
+static void addressbook_drag_leave_cb(GtkWidget      *widget,
+                                    GdkDragContext *context,
+                                    guint           time,
+                                    void           *data)
 {
-       const gchar *group_name = (const gchar *) gtk_object_get_data(GTK_OBJECT(menuitem),
-                                                                                                                                 "group_name");
-                                                                                                          
-       if (!group_name) {
-               g_warning("%s(%d) - invalid group name\n", __FILE__, __LINE__);
-               return ;
+       if (addrbook.treeSelected) {
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+               gtk_sctree_select( GTK_SCTREE(widget), addrbook.treeSelected);
+               g_signal_handlers_unblock_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
        }
-       g_return_if_fail(group_name != NULL); 
-
-       g_message("selected group %s from menu\n", group_name);
-       g_message("selected %s <%s>\n", data->name ? data->name : data->address, data->address);
-
-       addressbook_access();
-       addressbook_add_contact(group_name, data->name ? data->name : data->address, 
-                                                       data->address, data->remarks ? data->remarks : data->address);
-       addressbook_unaccess();
-
-       g_free(data);
 }
 
-/* addressbook_add_contact_by_meny() - launches menu with group items. submenu may be
- * the menu item in the parent menu, or NULL for a normal right-click context menu */
-gboolean addressbook_add_contact_by_menu(GtkWidget   *submenu,
-                                                                                const gchar *name, 
-                                                                                const gchar *address, 
-                                                                                const gchar *remarks)
+static void addressbook_drag_received_cb(GtkWidget        *widget,
+                                       GdkDragContext   *drag_context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *data,
+                                       guint             info,
+                                       guint             time,
+                                       void             *pdata)
 {
-       GtkWidget       *menu, *menuitem;
-       GList           *groups, *tmp;
-       ContactInfo *ci;
-
-       ci = addressbook_new_contact(name, address, remarks);
-       g_return_val_if_fail(ci != NULL, FALSE);
-
-       addressbook_access();
-       groups = addressbook_get_group_list();
-       g_return_val_if_fail(groups != NULL, (addressbook_destroy_contact(ci), FALSE));
+       gint row, column;
+       GtkCTreeNode *node;
+       ItemFolder *afolder = NULL;
+       ItemFolder *ofolder = NULL;
+       ItemPerson *person = NULL;
        
-       menu = gtk_menu_new();
-       g_return_val_if_fail(menu != NULL, (g_list_free(groups), addressbook_destroy_contact(ci), FALSE));
 
-       /* add groups to menu */
-       for (tmp = g_list_first(groups); tmp != NULL; tmp = g_list_next(tmp)) {
-               const gchar *display_name;
-               gchar *original_name = (gchar *) tmp->data;
-               gboolean addItem = TRUE;
+       if (!strcmp(data->data, "Dummy_addr")) {
+               AddressObject *obj = NULL;
+               AdapterDSource *ads = NULL;
+               AddressDataSource *ds = NULL;
+               GSList *cur = dragged_persons;
 
-               if (!g_strcasecmp(original_name, ADDRESS_TAG_PERSONAL)) {
-                       display_name = addressbook_get_personal_folder_name();
-               }
-               else if (!g_strcasecmp(original_name, ADDRESS_TAG_COMMON)) {
-                       display_name = addressbook_get_common_folder_name();
-               }
-               else if( ! g_strcasecmp( original_name, ADDRESS_TAG_VCARD ) ) {
-                       addItem = FALSE;
-               }
-#ifdef USE_JPILOT
-               else if( ! g_strcasecmp( original_name, ADDRESS_TAG_JPILOT ) ) {
-                       addItem = FALSE;
+               if (gtk_clist_get_selection_info
+                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0) {
+                       goto free_list;
                }
-#endif
-#ifdef USE_LDAP
-               else if( ! g_strcasecmp( original_name, ADDRESS_TAG_LDAP ) ) {
-                       addItem = FALSE;
-               }
-#endif
-               else {
-                       display_name = original_name;
+       
+               node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+               if( node ) 
+                       obj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), node );
+               if( obj == NULL ) 
+                       goto free_list;
+                               
+               if (obj->type == ADDR_ITEM_FOLDER) {
+                       afolder = ADAPTER_FOLDER(obj)->itemFolder;
+
+               } else if (obj->type == ADDR_DATASOURCE) {
+                       ads = ADAPTER_DSOURCE(obj);
+                       if( ads == NULL ) 
+                               goto free_list;
+                       ds = ads->dataSource;
+                       if( ds == NULL ||
+                           ds->type == ADDR_IF_JPILOT || 
+                           ds->type == ADDR_IF_LDAP) 
+                               goto free_list;         
+                       afolder = addrindex_ds_get_root_folder( ds );
+               } else {
+                       goto free_list;
                }
 
-               if( addItem ) {
-                       original_name = g_strdup(original_name);
-                       menuitem = gtk_menu_item_new_with_label(display_name);
-                       /* register the duplicated string pointer as object data,
-                        * so we get the opportunity to free it */
-                       gtk_object_set_data_full(GTK_OBJECT(menuitem), "group_name", 
-                                                                original_name, 
-                                                                (GtkDestroyNotify) group_object_data_destroy);
-                       gtk_signal_connect(GTK_OBJECT(menuitem), "activate", 
-                                                  GTK_SIGNAL_FUNC(addressbook_group_menu_selected),
-                                                  (gpointer)(ci));
-                       gtk_menu_append(GTK_MENU(menu), menuitem);
-                       gtk_widget_show(menuitem);
+               ofolder = dragged_folder;
+               
+               if (afolder && ofolder) {
+                       AddressBookFile *obook = dragged_ab;
+                       AddressBookFile *abook = addressbook_get_book_file_for_node(node);
+                       for (cur = dragged_persons; cur; cur = cur->next) {
+                               AddrBookBase *adbase = ( AddrBookBase * ) ds ? ds->rawDataSource : NULL;
+                               AddressCache *cache = (adbase) ? adbase->addressCache : NULL;
+
+                               person = (ItemPerson *)cur->data;
+                               addritem_folder_remove_person(ofolder, person);
+                               if (cache) {
+                                       addrcache_folder_add_person(cache, afolder, person);
+                               } else {
+                                       addritem_folder_add_person(afolder, person);
+                               }
+                       }
+                       addressbook_list_select_clear();
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
+                                                       
+                       if (abook) {
+                               addrbook_set_dirty(abook, TRUE);
+                       }
+                       if (obook) {
+                               addrbook_set_dirty(obook, TRUE);
+                       }
+                       
+                       addressbook_export_to_file();
                }
-       }
 
-       gtk_widget_show(menu);
-
-       if (submenu) {
-               gtk_menu_item_set_submenu(GTK_MENU_ITEM(submenu), menu);
-               gtk_widget_set_sensitive(GTK_WIDGET(submenu), TRUE);
-       } 
-       else {
-               gtk_widget_grab_focus(GTK_WIDGET(menu));
-               gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME);
+               gtk_drag_finish(drag_context, TRUE, TRUE, time);
        }
-
-       if (groups) g_list_free(groups);
-       return TRUE;
+free_list:
+       g_slist_free(dragged_persons);
+       dragged_persons = NULL;
 }
 
 /*