2005-07-15 [colin] 1.9.12cvs60
[claws.git] / src / addressbook.c
index e894a0010c9977a5c5dd76848d07e448d9a6ade7..c61c571da8d9f23edfa1e091e35b24942822c83c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 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
@@ -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"
@@ -54,7 +54,7 @@
 #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"
 
 #ifdef USE_LDAP
 #include <pthread.h>
-#include "syldap.h"
+#include "ldapserver.h"
 #include "editldap.h"
 
 #define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
 #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"
 
 typedef enum
 {
@@ -134,6 +137,8 @@ static GdkPixmap *categoryxpm;
 static GdkBitmap *categoryxpmmask;
 static GdkPixmap *ldapxpm;
 static GdkBitmap *ldapxpmmask;
+static GdkPixmap *addrsearchxpm;
+static GdkPixmap *addrsearchxpmmask;
 
 /* Message buffer */
 static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
@@ -167,14 +172,13 @@ static void addressbook_to_clicked                (GtkButton      *button,
 static void addressbook_lup_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_list_selected          (GtkCList       *clist,
-                                                gint            row,
+static void addressbook_select_row_tree                (GtkCTree       *ctree,
+                                                GtkCTreeNode   *node,
                                                 gint            column,
-                                                GdkEvent       *event,
                                                 gpointer        data);
 static void addressbook_list_row_selected      (GtkCTree       *clist,
                                                 GtkCTreeNode   *node,
@@ -196,16 +200,16 @@ static void addressbook_entry_gotfocus            (GtkWidget      *widget);
 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,
@@ -292,7 +296,7 @@ static void addressbook_move_nodes_up               (GtkCTree       *ctree,
                                                GtkCTreeNode    *node);
 static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
                                                   ItemGroup    *group);
-static void key_pressed                                (GtkWidget      *widget,
+static gboolean key_pressed                    (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
 static gint addressbook_treenode_compare_func  (GtkCList       *clist,
@@ -301,9 +305,19 @@ static gint addressbook_treenode_compare_func      (GtkCList       *clist,
 static gint addressbook_list_compare_func      (GtkCList       *clist,
                                                 gconstpointer   ptr1,
                                                 gconstpointer   ptr2);
+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);
 
 #ifdef USE_LDAP
-static void addressbook_ldap_show_message      (SyldapServer *server);
+static void addressbook_ldap_show_message      ( LdapServer *server );
 #endif
 
 /* LUT's and IF stuff */
@@ -330,6 +344,7 @@ 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 );
@@ -338,6 +353,48 @@ 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_LDAP
+static void addressbook_browse_entry_cb                ( void );
+#endif
+
+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 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>"},
@@ -368,25 +425,28 @@ static GtkItemFactoryEntry addressbook_entries[] =
        {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
        {N_("/_Address/_Edit"),         "<alt>Return",  addressbook_edit_address_cb,    0, NULL},
        {N_("/_Address/_Delete"),       NULL,           addressbook_delete_address_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, "<Separator>"},
        {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, "<LastBranch>"},
        {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_("/---"),            NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL},
        {N_("/_Delete"),        NULL, addressbook_treenode_delete_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_("/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}
@@ -394,19 +454,97 @@ static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 
 static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 {
+       {N_("/_Edit"),          NULL, addressbook_edit_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_("/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_("/---"),            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_("/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;
+}
 
 void addressbook_open(Compose *target)
 {
@@ -435,7 +573,10 @@ void addressbook_open(Compose *target)
        addressbook_set_target_compose(target);
 }
 
-void addressbook_destroy() {
+/**
+ * Destroy addressbook.
+ */
+void addressbook_destroy( void ) {
        /* Free up address stuff */
        if( _addressSelect_ != NULL ) {
                addrselect_list_free( _addressSelect_ );
@@ -444,7 +585,8 @@ void addressbook_destroy() {
                addrclip_free( _clipBoard_ );
        }
        if( _addressIndex_ != NULL ) {
-              addrindex_free_index( _addressIndex_ );
+               addrindex_free_index( _addressIndex_ );
+               addrindex_teardown();
        }
        _addressSelect_ = NULL;
        _clipBoard_ = NULL;
@@ -462,7 +604,10 @@ Compose *addressbook_get_target_compose(void)
        return addrbook.target_compose;
 }
 
-void addressbook_refresh(void)
+/**
+ * Refresh addressbook and save to file(s).
+ */
+void addressbook_refresh( void )
 {
        if (addrbook.window) {
                if (addrbook.treeSelected) {
@@ -521,6 +666,7 @@ static void addressbook_create(void)
        GList *nodeIf;
 
        gchar *titles[N_COLS];
+       gchar *dummy_titles[1];
        gchar *text;
        gint i;
 
@@ -529,18 +675,18 @@ static void addressbook_create(void)
        titles[COL_NAME]    = _("Name");
        titles[COL_ADDRESS] = _("E-Mail address");
        titles[COL_REMARKS] = _("Remarks");
+       dummy_titles[0]     = "";
 
        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_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "addressbook", "Sylpheed");
+       gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
+       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);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(addressbook_close), 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);
@@ -560,11 +706,11 @@ static void addressbook_create(void)
        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);
 
        /* Address index */
-       ctree = gtk_ctree_new(1, 0);
+       ctree = gtk_sctree_new_with_titles(1, 0, dummy_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);
@@ -575,25 +721,41 @@ static void addressbook_create(void)
        gtk_clist_set_compare_func(GTK_CLIST(ctree),
                                   addressbook_treenode_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);
+       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);
 
        /* Address list */
-       clist = gtk_ctree_new_with_titles(N_COLS, 0, titles);
+       clist = gtk_sctree_new_with_titles(N_COLS, 0, 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);
@@ -610,23 +772,24 @@ static void addressbook_create(void)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
                                       GTK_CAN_FOCUS);
 
-       gtk_signal_connect(GTK_OBJECT(clist), "tree_select_row",
-                          GTK_SIGNAL_FUNC(addressbook_list_row_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(clist), "tree_unselect_row",
-                          GTK_SIGNAL_FUNC(addressbook_list_row_unselected), 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);
-       gtk_signal_connect(GTK_OBJECT(clist), "select_row",
-                          GTK_SIGNAL_FUNC(addressbook_list_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(clist), "tree_expand",
-                          GTK_SIGNAL_FUNC(addressbook_person_expand_node), NULL );
-       gtk_signal_connect(GTK_OBJECT(clist), "tree_collapse",
-                          GTK_SIGNAL_FUNC(addressbook_person_collapse_node), 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);
 
@@ -637,12 +800,12 @@ static void addressbook_create(void)
        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), "focus_in_event",
+                        G_CALLBACK(addressbook_entry_gotfocus), 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();
@@ -659,7 +822,7 @@ static void addressbook_create(void)
        /* 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_box_set_spacing(GTK_BOX(hbbox), 2);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
        del_btn = gtk_button_new_with_label(_("Delete"));
@@ -672,12 +835,12 @@ static void addressbook_create(void)
        GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), 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(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:");
@@ -692,15 +855,15 @@ static void addressbook_create(void)
        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));
+       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));
 
        /* Build icons for interface */
        stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
@@ -741,8 +904,8 @@ static void addressbook_create(void)
                                       n_entries,
                                       "<AddressBookTree>", &tree_factory,
                                       NULL);
-       gtk_signal_connect(GTK_OBJECT(tree_popup), "selection_done",
-                          GTK_SIGNAL_FUNC(addressbook_popup_close), NULL);
+       g_signal_connect(G_OBJECT(tree_popup), "selection_done",
+                        G_CALLBACK(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,
@@ -753,6 +916,8 @@ static void addressbook_create(void)
        addrbook.window  = window;
        addrbook.menubar = menubar;
        addrbook.ctree   = ctree;
+       addrbook.ctree_swin
+                        = ctree_swin;
        addrbook.clist   = clist;
        addrbook.entry   = entry;
        addrbook.statusbar = statusbar;
@@ -775,15 +940,23 @@ static void addressbook_create(void)
        addrbook.listSelected = NULL;
        address_completion_start(window);
        gtk_widget_show_all(window);
+       gtk_widget_set_sensitive(addrbook.lup_btn, FALSE);
 
 }
 
+/**
+ * Close address book window and save to file(s).
+ */
 static gint addressbook_close( void ) {
        gtk_widget_hide(addrbook.window);
        addressbook_export_to_file();
        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(
@@ -816,6 +989,7 @@ static void addressbook_ds_status_message( AddressDataSource *ds, gchar *msg ) {
 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 );
@@ -825,9 +999,9 @@ static void addressbook_ds_show_message( AddressDataSource *ds ) {
                                    sizeof(addressbook_msgbuf), "%s", name );
                }
                else {
+                       desc = addressbook_err2string( _lutErrorsGeneral_, retVal );
                        g_snprintf( addressbook_msgbuf, 
-                                   sizeof(addressbook_msgbuf), "%s: %s", name,
-                                   mgu_error2string( retVal ) );
+                           sizeof(addressbook_msgbuf), "%s: %s", name, desc );
                }
        }
        addressbook_status_show( addressbook_msgbuf );
@@ -873,7 +1047,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        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);
 
@@ -889,7 +1064,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        if( iface->readOnly ) {
                alertpanel( _("Delete address(es)"),
                        _("This address data is readonly and cannot be deleted."),
-                       _("Close"), NULL, NULL );
+                       GTK_STOCK_CLOSE, NULL, NULL );
                return;
        }
 
@@ -912,7 +1087,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        /* Confirm deletion */
        aval = alertpanel( _("Delete address(es)"),
                        _("Really delete the address(es)?"),
-                       _("Yes"), _("No"), NULL );
+                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
        if( aval != G_ALERTDEFAULT ) return;
 
        /* Process deletions */
@@ -935,9 +1110,13 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                }
                                /* Remove group from parent node */
                                gtk_ctree_remove_node( ctree, nd );
+                               refreshList = 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((ItemFolder *)pobj, item);
                                item = addrbook_remove_person( abf, item );
                                if( item ) {
                                        addritem_free_item_person( item );
@@ -950,11 +1129,15 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                if( item ) {
                                        addritem_free_item_email( item );
                                }
+                               addressbook_folder_refresh_one_person( clist, person );
                        }
                }
                g_list_free( list );
                addressbook_list_select_clear();
-               gtk_ctree_select( ctree, addrbook.opened);
+               if( refreshList ) 
+                       gtk_ctree_select( ctree, addrbook.opened);
+               addrbook_set_dirty(abf, TRUE);
+               addressbook_export_to_file();
                return;
        }
        else if( pobj->type == ADDR_ITEM_GROUP ) {
@@ -977,6 +1160,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                g_list_free( list );
                addressbook_list_select_clear();
                gtk_ctree_select( ctree, addrbook.opened);
+               addrbook_set_dirty(abf, TRUE);
+               addressbook_export_to_file();
                return;
        }
 
@@ -1053,7 +1238,7 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
        if( ! compose ) return;
 
        /* Nothing selected, but maybe there is something in text entry */
-       addr = gtk_entry_get_text( GTK_ENTRY( addrbook.entry) );
+       addr = (char *)gtk_entry_get_text( GTK_ENTRY( addrbook.entry) );
        if ( addr ) {
                compose_entry_append(
                        compose, addr, (ComposeEntryType)data );
@@ -1103,6 +1288,7 @@ static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
        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/New Folder",  sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To",     sensitive );
        gtk_widget_set_sensitive( addrbook.reg_btn, sensitive );
        gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
 }
@@ -1181,15 +1367,26 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
 
        /* 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,
+/**
+ * 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 = NULL;
        AdapterDSource *ads = NULL;
        AddressDataSource *ds = NULL;
        ItemFolder *rootFolder = NULL;
+       AddressObjectType aot;
 
        addrbook.treeSelected = node;
        addrbook.listSelected = NULL;
@@ -1198,7 +1395,7 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
 
        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;
+       if( obj == NULL ) return FALSE;
 
        addrbook.opened = node;
 
@@ -1207,9 +1404,9 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                static gboolean tVal = TRUE;
 
                ads = ADAPTER_DSOURCE(obj);
-               if( ads == NULL ) return;
+               if( ads == NULL ) return FALSE;
                ds = ads->dataSource;
-               if( ds == NULL ) return;                
+               if( ds == NULL ) return FALSE;          
 
                if( addrindex_ds_get_modify_flag( ds ) ) {
                        addrindex_ds_read_data( ds );
@@ -1229,11 +1426,15 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                        /* Load folders into the tree */
                        rootFolder = addrindex_ds_get_root_folder( ds );
                        if( ds->type == ADDR_IF_JPILOT ) {
-                               addressbook_node_add_folder( node, ds, rootFolder, ADDR_CATEGORY );
+                               aot = ADDR_CATEGORY;
+                       }
+                       else if( ds->type == ADDR_IF_LDAP ) {
+                               aot = ADDR_LDAP_QUERY;
                        }
                        else {
-                               addressbook_node_add_folder( node, ds, rootFolder, ADDR_ITEM_FOLDER );
+                               aot = ADDR_ITEM_FOLDER;
                        }
+                       addressbook_node_add_folder( node, ds, rootFolder, aot );
                        addrindex_ds_set_access_flag( ds, &tVal );
                        gtk_ctree_expand( ctree, node );
                }
@@ -1247,13 +1448,14 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        addressbook_menuitem_set_sensitive( obj, node );
 
        addressbook_list_select_clear();
+       
+       return FALSE;
 }
 
-/*
-* Setup address list popup menu.
-* Enter: pobj  Parent address object in address tree.
-*        obj   Address object in address list.
-*/
+/**
+ * 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;
@@ -1266,6 +1468,7 @@ static void addressbook_list_menu_setup( void ) {
        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;
@@ -1277,6 +1480,7 @@ static void addressbook_list_menu_setup( void ) {
        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;
@@ -1291,14 +1495,17 @@ static void addressbook_list_menu_setup( void ) {
                }
        }
        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 Folder", TRUE );
                                menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
@@ -1307,15 +1514,21 @@ static void addressbook_list_menu_setup( void ) {
                        if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
                        if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
                }
+               if( iface->type == ADDR_IF_LDAP ) {
+                       if( obj ) canBrowse = TRUE;
+               }
        }
        if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
 
-       canDelete = canEdit;
        canDelete = canEdit;
 
-       /* Disable edit if more than one row selected */
-       if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) canEdit = FALSE;
+       /* Disable edit or browse if more than one row selected */
+       if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
+               canEdit = FALSE;
+               canBrowse = FALSE;
+       }
 
+       /* Now go finalize menu items */
        menu_set_sensitive( addrbook.list_factory, "/Edit",   canEdit );
        menu_set_sensitive( addrbook.list_factory, "/Delete", canDelete );
 
@@ -1324,39 +1537,40 @@ static void addressbook_list_menu_setup( void ) {
        menu_set_sensitive( addrbook.list_factory, "/Paste",         canPaste );
        menu_set_sensitive( addrbook.list_factory, "/Paste Address", canPaste );
 
+       menu_set_sensitive( addrbook.list_factory, "/Mail To",       canCopy );
+
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Cut",           canCut );
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Copy",          canCopy );
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste",         canPaste );
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );
 
-       menu_set_sensitive( addrbook.tree_factory, "/Cut",           canCut );
-       menu_set_sensitive( addrbook.tree_factory, "/Copy",          canCopy );
-       menu_set_sensitive( addrbook.tree_factory, "/Paste",         canPaste );
+       menu_set_sensitive( addrbook.tree_factory, "/Cut",             canCut );
+       menu_set_sensitive( addrbook.tree_factory, "/Copy",            canCopy );
+       menu_set_sensitive( addrbook.tree_factory, "/Paste",           canPaste );
 
-       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/Edit",    canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Delete",  canDelete );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", canCopy );
 
        gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
+
+#ifdef USE_LDAP
+       menu_set_sensitive( addrbook.list_factory, "/Browse Entry",    canBrowse );
+#endif
 }
 
-static void addressbook_list_selected(GtkCList *clist, gint row, gint column,
-                                     GdkEvent *event, gpointer data)
+static void addressbook_select_row_tree        (GtkCTree       *ctree,
+                                        GtkCTreeNode   *node,
+                                        gint            column,
+                                        gpointer        data)
 {
-       if (event && event->type == GDK_2BUTTON_PRESS) {
-               /* Handle double click */
-               if (prefs_common.add_address_by_click &&
-                   addrbook.target_compose)
-                       addressbook_to_clicked(NULL, NULL);
-               else
-                       addressbook_edit_address_cb(NULL, 0, NULL);
-       }
 }
 
-/*
+/**
  * Add list of items into tree node below specified tree node.
- * Enter: treeNode  Tree node.
- *        ds        Data source.
- *        listItems List of items.
+ * \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 )
@@ -1386,9 +1600,9 @@ static void addressbook_treenode_add_list(
        }
 }
 
-/*
-* Cut from address list widget.
-*/
+/**
+ * Cut from address list widget.
+ */
 static void addressbook_clip_cut_cb( void ) {
        _clipBoard_->cutFlag = TRUE;
        addrclip_clear( _clipBoard_ );
@@ -1396,9 +1610,9 @@ static void addressbook_clip_cut_cb( void ) {
        /* addrclip_list_show( _clipBoard_, stdout ); */
 }
 
-/*
-* Copy from address list widget.
-*/
+/**
+ * Copy from address list widget.
+ */
 static void addressbook_clip_copy_cb( void ) {
        _clipBoard_->cutFlag = FALSE;
        addrclip_clear( _clipBoard_ );
@@ -1406,9 +1620,9 @@ static void addressbook_clip_copy_cb( void ) {
        /* addrclip_list_show( _clipBoard_, stdout ); */
 }
 
-/*
-* Paste clipboard into address list widget.
-*/
+/**
+ * Paste clipboard into address list widget.
+ */
 static void addressbook_clip_paste_cb( void ) {
        GtkCTree *ctree = GTK_CTREE( addrbook.ctree );
        AddressObject *pobj = NULL;
@@ -1474,9 +1688,9 @@ static void addressbook_clip_paste_cb( void ) {
 
 }
 
-/*
-* Paste clipboard email addresses only into address list widget.
-*/
+/**
+ * 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;
@@ -1539,10 +1753,10 @@ static void addressbook_clip_paste_address_cb( void ) {
        }
 }
 
-/*
-* Add current treenode object to clipboard. Note that widget only allows
-* one entry from the tree list to be selected.
-*/
+/**
+ * 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;
@@ -1590,9 +1804,9 @@ static void addressbook_treenode_to_clipboard( void ) {
        }
 }
 
-/*
-* Cut from tree widget.
-*/
+/**
+ * Cut from tree widget.
+ */
 static void addressbook_treenode_cut_cb( void ) {
        _clipBoard_->cutFlag = TRUE;
        addressbook_treenode_to_clipboard();
@@ -1601,9 +1815,9 @@ static void addressbook_treenode_cut_cb( void ) {
        /* addrclip_list_show( _clipBoard_, stdout ); */
 }
 
-/*
-* Copy from tree widget.
-*/
+/**
+ * Copy from tree widget.
+ */
 static void addressbook_treenode_copy_cb( void ) {
        _clipBoard_->cutFlag = FALSE;
        addressbook_treenode_to_clipboard();
@@ -1612,17 +1826,25 @@ static void addressbook_treenode_copy_cb( void ) {
        /* addrclip_list_show( _clipBoard_, stdout ); */
 }
 
-/*
-* Paste clipboard into address tree widget.
-*/
+/**
+ * Paste clipboard into address tree widget.
+ */
 static void addressbook_treenode_paste_cb( void ) {
        addressbook_clip_paste_cb();
 }
 
+/**
+ * Clear selected entries in clipboard.
+ */
 static void addressbook_list_select_clear( void ) {
        addrselect_list_clear( _addressSelect_ );
 }
 
+/**
+ * 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;
 
@@ -1632,10 +1854,28 @@ static void addressbook_list_select_add( AddrItemObject *aio, AddressDataSource
        g_free( cacheID );
 }
 
+/**
+ * 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 );
 }
 
+/**
+ * Invoke EMail compose window with addresses in selected address list.
+ */
+static void addressbook_mail_to_cb( void ) {
+       GList *listAddress;
+
+       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_list_row_selected( GtkCTree *clist,
                                           GtkCTreeNode *node,
                                           gint column,
@@ -1663,7 +1903,7 @@ static void addressbook_list_row_selected( GtkCTree *clist,
 
        aio = gtk_ctree_node_get_row_data( clist, node );
        if( aio ) {
-               /* printf( "list select: %d : '%s'\n", aio->type, aio->name ); */
+               printf( "list select: %d : '%s'\n", aio->type, aio->name );
                addressbook_list_select_add( aio, ds );
        }
 
@@ -1688,29 +1928,47 @@ static void addressbook_entry_gotfocus( GtkWidget *widget ) {
        gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
 }
 
-static void addressbook_list_button_pressed(GtkWidget *widget,
-                                           GdkEventButton *event,
-                                           gpointer data)
+/* from gdkevents.c */
+#define DOUBLE_CLICK_TIME 250
+
+static gboolean addressbook_list_button_pressed(GtkWidget *widget,
+                                               GdkEventButton *event,
+                                               gpointer data)
 {
-       if( ! event ) return;
+       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);
+
+                       lasttime = 0;
+               } else
+                       lasttime = event->time;
        }
+
+       return FALSE;
 }
 
-static void addressbook_list_button_released(GtkWidget *widget,
-                                            GdkEventButton *event,
-                                            gpointer data)
+static gboolean addressbook_list_button_released(GtkWidget *widget,
+                                                GdkEventButton *event,
+                                                gpointer data)
 {
+       return FALSE;
 }
 
-static void addressbook_tree_button_pressed(GtkWidget *ctree,
-                                           GdkEventButton *event,
-                                           gpointer data)
+static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
+                                               GdkEventButton *event,
+                                               gpointer data)
 {
        GtkCList *clist = GTK_CLIST(ctree);
        gint row, column;
@@ -1719,14 +1977,16 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
        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;
+       if( ! event ) return FALSE;
        addressbook_menubar_set_sensitive( FALSE );
 
        if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
@@ -1736,8 +1996,9 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
        }
 
        menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
+       gtk_widget_set_sensitive( addrbook.lup_btn, FALSE );
 
-       if( obj == NULL ) return;
+       if( obj == NULL ) return FALSE;
 
        if( ! addrclip_is_empty( _clipBoard_ ) ) {
                canTreePaste = TRUE;
@@ -1748,6 +2009,7 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
                ds = ads->dataSource;
                iface = ds->interface;
                canEdit = TRUE;
+               canDelete = TRUE;
                if( iface->readOnly ) {
                        canTreePaste = FALSE;
                }
@@ -1758,6 +2020,7 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
                        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 );
@@ -1767,6 +2030,7 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
                }
                else {
                        canEdit = TRUE;
+                       canDelete = TRUE;
                        canTreeCut = TRUE;
                        menu_set_sensitive( addrbook.tree_factory, "/New Address", TRUE );
                        menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
@@ -1774,12 +2038,19 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
                        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;
+               }
        }
        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.tree_factory, "/New Address", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
@@ -1796,7 +2067,7 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
 
        /* Enable edit */
        menu_set_sensitive( addrbook.tree_factory, "/Edit",   canEdit );
-       menu_set_sensitive( addrbook.tree_factory, "/Delete", 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 );
@@ -1808,19 +2079,23 @@ static void addressbook_tree_button_pressed(GtkWidget *ctree,
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste",         canPaste );
        menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );
 
+       gtk_widget_set_sensitive( addrbook.lup_btn, canLookup );
+
        if( event->button == 3 ) {
                gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
                               event->button, event->time);
        }
 
+       return FALSE;
 }
 
-static void addressbook_tree_button_released(GtkWidget *ctree,
-                                            GdkEventButton *event,
-                                            gpointer data)
+static gboolean 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);
+       return FALSE;
 }
 
 static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
@@ -1863,9 +2138,11 @@ static void addressbook_new_folder_cb(gpointer data, guint action,
        folder = addressbook_edit_folder( abf, parentFolder, NULL );
        if( folder ) {
                GtkCTreeNode *nn;
-               nn = addressbook_node_add_folder( addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
+               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);
+               if( addrbook.treeSelected == addrbook.opened )
+                       addressbook_set_clist(obj);
        }
 
 }
@@ -1903,7 +2180,8 @@ static void addressbook_new_group_cb(gpointer data, guint action,
                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);
+               if( addrbook.treeSelected == addrbook.opened )
+                       addressbook_set_clist(obj);
        }
 
 }
@@ -1925,12 +2203,12 @@ static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
                                is_leaf, expanded);
 }
 
-/*
-* Edit data source.
-* Enter: obj   Address object to edit.
-*        node  Node in tree.
-* Return: New name of data source.
-*/
+/**
+ * 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;
@@ -2032,22 +2310,34 @@ static void addressbook_treenode_edit_cb(gpointer data, guint action,
        }
 }
 
-/*
-* Delete an item from the tree widget.
-*/
-static void addressbook_treenode_delete_cb(gpointer data, guint action,
-                                        GtkWidget *widget)
+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;
-       AddressBookFile *abf = NULL;
+       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;
@@ -2067,57 +2357,105 @@ static void addressbook_treenode_delete_cb(gpointer data, guint action,
                ds = addressbook_find_datasource( node );
                if( ds == NULL ) return;
 
-               /* Only allow deletion from non-readOnly data sources */
+               /* Only allow deletion from non-readOnly */
                iface = ds->interface;
-               if( iface->readOnly ) return;
+               if( iface->readOnly ) {
+                       /* Allow deletion of query results */
+                       if( ! iface->externalQuery ) return;
+               }
        }
 
        /* Confirm deletion */
+       delType = ADDRTREE_DEL_NONE;
        if( obj->type == ADDR_ITEM_FOLDER ) {
-               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"), message,
-                       _("Folder only"), _("Folder and Addresses"), _("Cancel") );
-               g_free(message);
-               if( aval == G_ALERTOTHER ) return;
+               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 {
                message = g_strdup_printf(_("Really delete `%s' ?"), obj->name);
-               aval = alertpanel(_("Delete"), message, _("Yes"), _("No"), NULL);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                g_free(message);
-               if (aval != G_ALERTDEFAULT) return;
+               if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
        }
+       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 );
-                       remFlag = TRUE;
                }
+               return;
        }
-       else {
-               abf = addressbook_get_book_file();
-               if( abf == NULL ) return;
+
+       /* 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;
        }
 
+       /* Code below is valid for regular address book deletion */
        if( obj->type == ADDR_ITEM_FOLDER ) {
                AdapterFolder *adapter = ADAPTER_FOLDER(obj);
                ItemFolder *item = adapter->itemFolder;
-               if( aval == G_ALERTDEFAULT ) {
+
+               if( delType == ADDRTREE_DEL_FOLDER_ONLY ) {
                        /* Remove folder only */
-                       item = addrbook_remove_folder( abf, item );
+                       item = addrcache_remove_folder( cache, item );
                        if( item ) {
                                addritem_free_item_folder( item );
                                addressbook_move_nodes_up( ctree, node );
                                remFlag = TRUE;
                        }
                }
-               else if( aval == G_ALERTALTERNATE ) {
+               else if( delType == ADDRTREE_DEL_FOLDER_ADDR ) {
                        /* Remove folder and addresses */
-                       item = addrbook_remove_folder_delete( abf, item );
+                       item = addrcache_remove_folder_delete( cache, item );
                        if( item ) {
                                addritem_free_item_folder( item );
                                remFlag = TRUE;
@@ -2128,7 +2466,7 @@ static void addressbook_treenode_delete_cb(gpointer data, guint action,
                AdapterGroup *adapter = ADAPTER_GROUP(obj);
                ItemGroup *item = adapter->itemGroup;
 
-               item = addrbook_remove_group( abf, item );
+               item = addrcache_remove_group( cache, item );
                if( item ) {
                        addritem_free_item_group( item );
                        remFlag = TRUE;
@@ -2158,10 +2496,10 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
                        /* New address */
                        ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
-                       if( person ) {
-                               if( addrbook.treeSelected == addrbook.opened ) {
-                                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
-                               }
+                       if( person && addrbook.treeSelected == addrbook.opened ) {
+                               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+                               addressbook_folder_refresh_one_person(
+                                       GTK_CTREE(addrbook.clist), person );
                        }
                }
        }
@@ -2187,11 +2525,11 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
        }
 }
 
-/*
-* Search for specified child group node in address index tree.
-* Enter: parent Parent node.
-*        group  Group to find.
-*/
+/**
+ * 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;
@@ -2224,6 +2562,16 @@ static AddressBookFile *addressbook_get_book_file() {
        return abf;
 }
 
+static AddressBookFile *addressbook_get_book_file_for_node(GtkCTreeNode *node) {
+       AddressBookFile *abf = NULL;
+       AddressDataSource *ds = NULL;
+
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return NULL;
+       if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+       return abf;
+}
+
 static void addressbook_tree_remove_children( GtkCTree *ctree, GtkCTreeNode *parent ) {
        GtkCTreeNode *node;
        GtkCTreeRow *row;
@@ -2289,7 +2637,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                        ItemPerson *person;
                        person = ( ItemPerson * ) ADDRITEM_PARENT(email);
                        if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
-                       gtk_ctree_select( ctree, addrbook.opened );
+                       addressbook_folder_refresh_one_person( clist, person );
                        invalidate_address_completion();
                        return;
                }
@@ -2298,8 +2646,8 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                /* Edit person - basic page */
                ItemPerson *person = ( ItemPerson * ) obj;
                if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
-               gtk_ctree_select( ctree, addrbook.opened);
                invalidate_address_completion();
+               addressbook_folder_refresh_one_person( clist, person );
                return;
        }
        else if( obj->type == ADDR_ITEM_GROUP ) {
@@ -2317,7 +2665,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
        if( node == NULL ) return;
        addressbook_change_node_name( node, name );
        gtk_sctree_sort_node( ctree, parentNode );
-       gtk_ctree_select( ctree, addrbook.opened );
+       gtk_ctree_select( ctree, addrbook.opened ); 
 }
 
 static void addressbook_delete_address_cb(gpointer data, guint action,
@@ -2397,91 +2745,140 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
        }
 }
 
-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 );
-
-       if( atci == NULL ) return;
-       if( atciMail == NULL ) return;
-
-       /* Load email addresses */
-       items = addritem_folder_get_person_list( itemFolder );
-       for( ; items != NULL; items = g_list_next( items ) ) {
-               GtkCTreeNode *nodePerson = NULL;
-               GtkCTreeNode *nodeEMail = NULL;
-               gchar *text[N_COLS];
-               gboolean flgFirst = TRUE, haveAddr = FALSE;
-               ItemPerson *person;
-               GList *node;
+static void addressbook_folder_load_one_person(
+               GtkCTree *clist, ItemPerson *person,
+               AddressTypeControlItem *atci,
+               AddressTypeControlItem *atciMail )
+{
+       GtkCTreeNode *nodePerson = NULL;
+       GtkCTreeNode *nodeEMail = NULL;
+       gchar *text[N_COLS];
+       gboolean flgFirst = TRUE, haveAddr = FALSE;
+       GList *node;
 
-               person = ( ItemPerson * ) items->data;
-               if( person == NULL ) continue;
+       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_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 );
+               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 {
-                               /* 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 );
+                               text[COL_NAME] = ADDRITEM_NAME(person);
                        }
-                       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 );
+                       g_free( str );
+                       str = NULL;
                        gtk_ctree_node_set_row_data(clist, nodePerson, person );
                }
-               gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+               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;
+}
+
+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 );
+
+       if( atci == NULL ) return;
+       if( atciMail == NULL ) return;
+
+       /* 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 );
 }
 
+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_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 );
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       if( node ) {
+               gtk_ctree_select( clist, node );
+               if (!gtk_ctree_node_is_visible( clist, node ) ) 
+                       gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
+       }
+}
+
+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 );
+       }
+}
+
 static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFolder ) {
        GList *items;
        AddressTypeControlItem *atci =  addrbookctl_lookup( ADDR_ITEM_GROUP );
@@ -2510,12 +2907,12 @@ static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFold
        g_list_free( items );
 }
 
-/*
-* Search ctree widget callback function.
-* Enter: pA Pointer to node.
-*        pB Pointer to data item being sought.
-* Return: Zero (0) if group found.
-*/
+/**
+ * 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;
 
@@ -2530,12 +2927,12 @@ static int addressbook_treenode_find_group_cb( gconstpointer pA, gconstpointer p
        return 1;
 }
 
-/*
-* Search ctree widget callback function.
-* Enter: pA Pointer to node.
-*        pB Pointer to data item being sought.
-* Return: Zero (0) if folder found.
-*/
+/**
+ * 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;
 
@@ -2597,11 +2994,11 @@ static void addressbook_treenode_remove_item( void ) {
        }
 }
 
-/*
-* Find parent datasource for specified tree node.
-* Enter: node Node to test.
-* Return: Data source, or NULL if not found.
-*/
+/**
+ * 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;
@@ -2625,10 +3022,10 @@ static AddressDataSource *addressbook_find_datasource( GtkCTreeNode *node ) {
        return ds;
 }
 
-/*
-* Load address list widget with children of specified object.
-* Enter: obj   Parent object to be loaded.
-*/
+/**
+ * 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);
@@ -2656,8 +3053,10 @@ static void addressbook_set_clist( AddressObject *obj ) {
                        /* 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 ) );
+                       addressbook_folder_load_person(
+                               ctreelist, addrindex_ds_get_root_folder( ds ) );
+                       addressbook_folder_load_group(
+                               ctreelist, addrindex_ds_get_root_folder( ds ) );
                }
        }
        else {
@@ -2673,17 +3072,18 @@ static void addressbook_set_clist( AddressObject *obj ) {
                        addressbook_folder_load_group( ctreelist, itemFolder );
                }
        }
-       /* gtk_clist_sort(clist); */
+       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
        gtk_clist_thaw(clist);
 }
 
-/*
-* 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().
-* Enter: data Tree node's row data.
-*/
+/**
+ * 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;
 
@@ -2722,7 +3122,8 @@ AdapterDSource *addressbook_create_ds_adapter( AddressDataSource *ds,
 }
 
 void addressbook_ads_set_name( AdapterDSource *adapter, gchar *value ) {
-       ADDRESS_OBJECT_NAME(adapter) = mgu_replace_string( ADDRESS_OBJECT_NAME(adapter), value );
+       ADDRESS_OBJECT_NAME(adapter) =
+               mgu_replace_string( ADDRESS_OBJECT_NAME(adapter), value );
 }
 
 /*
@@ -2753,8 +3154,10 @@ static void addressbook_load_tree( void ) {
                                        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) );
+                                       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 );
@@ -2839,11 +3242,13 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
        }
        if( errFlag ) {
                debug_print( "Error\n%s\n", msg );
-               alertpanel( _( "Addressbook conversion error" ), msg, _( "Close" ), NULL, NULL );
+               alertpanel_with_type( _( "Addressbook conversion error" ), msg, GTK_STOCK_CLOSE, 
+                                     NULL, NULL, NULL, ALERT_ERROR );
        }
        else if( msg ) {
                debug_print( "Warning\n%s\n", msg );
-               alertpanel( _( "Addressbook conversion" ), msg, _( "Close" ), NULL, NULL );
+               alertpanel_with_type( _( "Addressbook conversion" ), msg, GTK_STOCK_CLOSE, 
+                                     NULL, NULL, NULL, ALERT_WARNING );
        }
 
        return retVal;
@@ -2859,6 +3264,7 @@ void addressbook_read_file( void ) {
        }
 
        addrIndex = addrindex_create_index();
+       addrindex_initialize();
 
        /* Use new address book index. */
        addrindex_set_file_path( addrIndex, get_rc_dir() );
@@ -2878,9 +3284,10 @@ void addressbook_read_file( void ) {
                /* Error reading address book */
                debug_print( "Could not read address index.\n" );
                addrindex_print_index( addrIndex, stdout );
-               alertpanel( _( "Addressbook Error" ),
+               alertpanel_with_type( _( "Addressbook Error" ),
                            _( "Could not read address index" ),
-                           _( "Close" ), NULL, NULL );
+                           GTK_STOCK_CLOSE, NULL, NULL, NULL,
+                           ALERT_ERROR);
        }
        debug_print( "done.\n" );
 }
@@ -2935,14 +3342,17 @@ static GtkCTreeNode *addressbook_add_object(GtkCTreeNode *node,
        return added;
 }
 
-/*
-* Add group into the address index tree.
-* Enter: node     Parent node.
-*        ds        Data source.
-*        itemGroup Group to add.
-* Return: Inserted node.
-*/
-static GtkCTreeNode *addressbook_node_add_group( GtkCTreeNode *node, AddressDataSource *ds, ItemGroup *itemGroup ) {
+/**
+ * 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 )
+{
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
        GtkCTreeNode *newNode;
        AdapterGroup *adapter;
@@ -2970,25 +3380,32 @@ static GtkCTreeNode *addressbook_node_add_group( GtkCTreeNode *node, AddressData
        return newNode;
 }
 
-/*
-* Add folder into the address index tree.
-* Enter: node      Parent node.
-*        ds         Data source.
-*        itemFolder Folder to add.
-*        otype      Object type to display.
-* Return: Inserted node.
+/**
+ * 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 )
+               GtkCTreeNode *node, AddressDataSource *ds,
+               ItemFolder *itemFolder, AddressObjectType otype )
 {
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
        GtkCTreeNode *newNode = NULL;
        AdapterFolder *adapter;
        AddressTypeControlItem *atci = NULL;
        GList *listItems = NULL;
-       gchar **name;
+       gchar *name;
        ItemFolder *rootFolder;
 
+       /* Only visible folders */
+       if( itemFolder->isHidden ) return NULL;
+
        if( ds == NULL ) return NULL;
        if( node == NULL || itemFolder == NULL ) return NULL;
 
@@ -3001,18 +3418,19 @@ static GtkCTreeNode *addressbook_node_add_folder(
                newNode = node;
        }
        else {
-               name = &itemFolder->obj.name;
-
                adapter = g_new0( AdapterFolder, 1 );
                ADDRESS_OBJECT_TYPE(adapter) = ADDR_ITEM_FOLDER;
                ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemFolder) );
                adapter->itemFolder = itemFolder;
 
-               newNode = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+               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 );
-               gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
-                       addressbook_free_treenode );
+               if( newNode ) {
+                       gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+                               addressbook_free_treenode );
+               }
        }
 
        listItems = itemFolder->listFolder;
@@ -3048,10 +3466,11 @@ void addressbook_export_to_file( void ) {
        }
 }
 
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
                addressbook_close();
+       return FALSE;
 }
 
 /*
@@ -3068,7 +3487,7 @@ static gint addressbook_treenode_compare_func(
        if( cell2 ) name2 = cell2->u.text;
        if( ! name1 ) return ( name2 != NULL );
        if( ! name2 ) return -1;
-       return strcasecmp( name1, name2 );
+       return g_utf8_collate( name1, name2 );
 }
 
 /*
@@ -3089,7 +3508,7 @@ static gint addressbook_list_compare_func(
                /* Order by name */
                if( ! name1 ) return ( name2 != NULL );
                if( ! name2 ) return -1;
-               return strcasecmp( name1, name2 );
+               return g_utf8_collate( name1, name2 );
        }
        else {
                /* Order groups before person */
@@ -3179,116 +3598,290 @@ static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *wid
                }
        }
 }
+#endif
 
-static void addressbook_ldap_show_message( SyldapServer *svr ) {
-       gchar *name;
+/**
+ * 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( svr ) {
-               name = syldap_get_name( svr );
-               if( svr->busyFlag ) {
-                       g_snprintf( addressbook_msgbuf,
-                                   sizeof(addressbook_msgbuf), "%s: %s", name,
-                                   ADDRESSBOOK_LDAP_BUSYMSG );
-               }
-               else {
-                       if( svr->retVal == MGU_SUCCESS ) {
-                               g_snprintf( addressbook_msgbuf,
-                                           sizeof(addressbook_msgbuf), "%s",
-                                           name );
-                       }
-                       else {
-                               g_snprintf( addressbook_msgbuf,
-                                           sizeof(addressbook_msgbuf),
-                                           "%s: %s", name,
-                                           mgu_error2string( svr->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( "" );
+       }
 }
 
-static void ldapsearch_callback( SyldapServer *sls ) {
-       GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+/**
+ * Refresh addressbook by forcing refresh of current selected object in
+ * tree.
+ */
+static void addressbook_refresh_current( void ) {
        AddressObject *obj;
-       AdapterDSource *ads = NULL;
-       AddressDataSource *ds = NULL;
-       AddressInterface *iface = NULL;
-
-       if( sls == NULL ) return;
-       if( ! addrbook.treeSelected ) return;
-       if( GTK_CTREE_ROW( addrbook.treeSelected )->level == 1 ) return;
+       GtkCTree *ctree;
 
+       ctree = GTK_CTREE(addrbook.ctree);
        obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
        if( obj == NULL ) return;
-       if( obj->type == ADDR_DATASOURCE ) {
-               ads = ADAPTER_DSOURCE(obj);
-               if( ads->subType == ADDR_LDAP ) {
-                       SyldapServer *server;
+       addressbook_set_clist( obj );
+}
 
-                       ds = ads->dataSource;
-                       if( ds == NULL ) return;
-                       iface = ds->interface;
-                       if( ! iface->haveLibrary ) return;
-                       server = ds->rawDataSource;
-                       if( server == sls ) {
-                               /* Read from cache */
-                               gtk_widget_show_all(addrbook.window);
-                               addressbook_set_clist( obj );
-                               addressbook_ldap_show_message( sls );
-                               gtk_widget_show_all(addrbook.window);
-                               gtk_entry_set_text( GTK_ENTRY(addrbook.entry), "" );
-                       }
-               }
+/**
+ * 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 );
+       */
+}
+
+/**
+ * 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 );
        }
 }
+
+/**
+ * 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;
+
+       /* Remove idler function */
+       ptrQID = GINT_TO_POINTER( queryID );
+       if( ptrQID ) {
+               gtk_idle_remove_by_data( ptrQID );
+       }
+
+       /* 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 );
+}
+
+/**
+ * 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;
+
+       /* Setup a query */
+       if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
+
+       if( ds->type == ADDR_IF_LDAP ) {
+#if USE_LDAP
+               aoType = ADDR_LDAP_QUERY;
 #endif
+       }
+       else {
+               return;
+       }
 
-/*
- * Lookup button handler.
+       /* Get reference to address cache */    
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
+
+       /* 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_ctree_select( ctree, nNode );
+               addrbook.treeSelected = nNode;
+       }
+
+       /* 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_ );
+}
+
+/**
+ * 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 = GTK_CTREE(addrbook.ctree);
+       GtkCTree *ctree;
        AddressObject *obj;
-#ifdef USE_LDAP
-       AdapterDSource *ads = NULL;
-       AddressDataSource *ds = NULL;
-       AddressInterface *iface = NULL;
-#endif
-       gchar *sLookup;
-
-       sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
-       g_strchomp( sLookup );
+       AddressDataSource *ds;
+       AddressInterface *iface;
+       gchar *searchTerm;
+       GtkCTreeNode *node, *parentNode;
 
-       if( ! addrbook.treeSelected ) return;
-       if( GTK_CTREE_ROW( addrbook.treeSelected )->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.treeSelected );
+       ctree = GTK_CTREE(addrbook.ctree);
+       obj = gtk_ctree_node_get_row_data( ctree, node );
        if( obj == NULL ) return;
 
+       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 );
+}
+
 #ifdef USE_LDAP
-       if( obj->type == ADDR_DATASOURCE ) {
-               ads = ADAPTER_DSOURCE(obj);
-               if( ads->subType == ADDR_LDAP ) {
-                       SyldapServer *server;
+/**
+ * Browse address entry for highlighted entry.
+ */
+static void addressbook_browse_entry_cb(void)
+{
+       GtkCTree *clist = GTK_CTREE(addrbook.clist);
+       AddressObject *obj;
+       AddressDataSource *ds;
+       AddressInterface *iface;
+       ItemPerson *person;
+       ItemEMail *email;
 
-                       ds = ads->dataSource;
-                       if( ds == NULL ) return;
-                       iface = ds->interface;
-                       if( ! iface->haveLibrary ) return;
-                       server = ds->rawDataSource;
-                       if( server ) {
-                               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 );
-                       }
-               }
+       if(addrbook.listSelected == NULL)
+               return;
+
+       obj = gtk_ctree_node_get_row_data(clist, addrbook.listSelected);
+       if (obj == NULL)
+               return;
+
+       ds = addressbook_find_datasource(GTK_CTREE_NODE(addrbook.treeSelected));
+       if(ds == NULL)
+               return;
+
+       iface = ds->interface;
+       if(! iface->haveLibrary )
+               return;
+
+       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;
        }
-#endif
 
+       if( iface->type == ADDR_IF_LDAP ) {
+               browseldap_entry(ds, person->externalID);
+       }
 }
+#endif
 
 /* **********************************************************************
 * Build lookup tables.
@@ -3303,13 +3896,13 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
 ItemObjectType addressbook_type2item( AddressObjectType abType ) {
        ItemObjectType ioType;
 
-       ioType = ITEMTYPE_NONE;
        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;
 }
@@ -3330,6 +3923,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        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;
@@ -3484,7 +4078,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        atci->interfaceType = ADDR_IF_LDAP;
        atci->showInTree = TRUE;
        atci->treeExpand = TRUE;
-       atci->treeLeaf = TRUE;
+       atci->treeLeaf = FALSE;
        atci->displayName = _( "LDAP Server" );
        atci->iconXpm = ldapxpm;
        atci->maskXpm = ldapxpmmask;
@@ -3494,6 +4088,22 @@ void addrbookctl_build_map( GtkWidget *window ) {
        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 );
+
 }
 
 /*
@@ -3553,10 +4163,10 @@ static void addrbookctl_free_group( AdapterGroup *adapter ) {
        g_free( adapter );
 }
 
-/*
+/**
  * Build GUI interface list.
  */
-void addrbookctl_build_iflist() {
+void addrbookctl_build_iflist( void ) {
        AddressTypeControlItem *atci;
        AdapterInterface *adapter;
        GList *list = NULL;
@@ -3583,12 +4193,14 @@ void addrbookctl_build_iflist() {
                        adapter->haveLibrary = interface->haveLibrary;
                        ADDRESS_OBJECT(adapter)->type = ADDR_INTERFACE;
                        ADDRESS_OBJECT_NAME(adapter) = g_strdup( atci->displayName );
-                       _addressInterfaceList_ = g_list_append( _addressInterfaceList_, adapter );
+                       _addressInterfaceList_ =
+                               g_list_append( _addressInterfaceList_, adapter );
                }
                list = g_list_next( list );
        }
 }
 
+#if 0
 void addrbookctl_free_selection( GList *list ) {
        GList *node = list;
        while( node ) {
@@ -3598,11 +4210,13 @@ void addrbookctl_free_selection( GList *list ) {
        }
        g_list_free( list );
 }
+#endif
 
-/*
-* Find GUI interface type specified interface type.
-* Return: Interface item, or NULL if not 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 ) {
@@ -3613,10 +4227,10 @@ AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
        return NULL;
 }
 
-/*
-* Build interface list selection.
-*/
-void addrbookctl_build_ifselect() {
+/**
+ * Build interface list selection.
+ */
+void addrbookctl_build_ifselect( void ) {
        GList *newList = NULL;
        gchar *selectStr;
        gchar **splitStr;
@@ -3625,7 +4239,6 @@ void addrbookctl_build_ifselect() {
        gchar *endptr = NULL;
        gboolean enabled;
        AdapterInterface *adapter;
-       /* GList *node; */
 
        selectStr = g_strdup( ADDRESSBOOK_IFACE_SELECTION );
 
@@ -3660,18 +4273,19 @@ void addrbookctl_build_ifselect() {
        g_list_free( _addressIFaceSelection_ );
        _addressIFaceSelection_ = newList;
        newList = NULL;
-
 }
 
-/* **********************************************************************
-* Add sender to address book.
-* ***********************************************************************
-*/
+/* ***********************************************************************
+ * 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 ) {
+gboolean addressbook_add_contact(
+               const gchar *name, const gchar *address, const gchar *remarks )
+{
        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" );
@@ -3681,96 +4295,14 @@ gboolean addressbook_add_contact( const gchar *name, const gchar *address, const
 }
 
 /* **********************************************************************
-* Address completion support.
-* ***********************************************************************
-*/
-
-/*
-* This function is used by the address completion function to load
-* addresses.
-* Enter: callBackFunc Function to be called when an address is
-*                     to be loaded.
-* Return: TRUE if data loaded, FALSE if address index not loaded.
-*/
-gboolean addressbook_load_completion( gint (*callBackFunc) ( const gchar *, const gchar *, const gchar * ) ) {
-       AddressDataSource *ds;
-       GList *nodeIf, *nodeDS;
-       GList *listP, *nodeP;
-       GList *nodeM;
-       gchar *sName, *sAddress, *sAlias, *sFriendly;
-
-       debug_print( "addressbook_load_completion\n" );
-
-       if( _addressIndex_ == NULL ) return FALSE;
-
-       nodeIf = addrindex_get_interface_list( _addressIndex_ );
-       while( nodeIf ) {
-               AddressInterface *interface = nodeIf->data;
-               nodeDS = interface->listSource;
-               while( nodeDS ) {
-                       ds = nodeDS->data;
-
-                       /* Read address book */
-                       if( addrindex_ds_get_modify_flag( ds ) ) {
-                               addrindex_ds_read_data( ds );
-                       }
-
-                       if( ! addrindex_ds_get_read_flag( ds ) ) {
-                               addrindex_ds_read_data( ds );
-                       }
-
-                       /* Get all persons */
-                       listP = addrindex_ds_get_all_persons( ds );
-                       nodeP = listP;
-                       while( nodeP ) {
-                               ItemPerson *person = nodeP->data;
-                               nodeM = person->listEMail;
-
-                               /* Figure out name to use */
-                               sName = person->nickName;
-                               if( sName == NULL || *sName == '\0' ) {
-                                       sName = ADDRITEM_NAME(person);
-                               }
-
-                               /* Process each E-Mail address */
-                               while( nodeM ) {
-                                       ItemEMail *email = nodeM->data;
-                                       /* Have mail */
-                                       sFriendly = sName;
-                                       sAddress = email->address;
-                                       if( sAddress || *sAddress != '\0' ) {
-                                               sAlias = ADDRITEM_NAME(email);
-                                               if( sAlias && *sAlias != '\0' ) {
-                                                       sFriendly = sAlias;
-                                               }
-                                               ( callBackFunc ) ( sFriendly, sAddress, sName );
-                                       }
-
-                                       nodeM = g_list_next( nodeM );
-                               }
-                               nodeP = g_list_next( nodeP );
-                       }
-                       /* Free up the list */
-                       g_list_free( listP );
-
-                       nodeDS = g_list_next( nodeDS );
-               }
-               nodeIf = g_list_next( nodeIf );
-       }
-       debug_print( "addressbook_load_completion... done\n" );
-
-       return TRUE;
-}
-
-/* **********************************************************************
-* Address Import.
-* ***********************************************************************
-*/
+ * Address Import.
+ * ***********************************************************************
+ */
 
-/*
-* Import LDIF file.
-*/
-static void addressbook_import_ldif_cb() {
+/**
+ * Import LDIF file.
+ */
+static void addressbook_import_ldif_cb( void ) {
        AddressDataSource *ds = NULL;
        AdapterDSource *ads = NULL;
        AddressBookFile *abf = NULL;
@@ -3805,10 +4337,10 @@ static void addressbook_import_ldif_cb() {
        }
 }
 
-/*
-* Import MUTT file.
-*/
-static void addressbook_import_mutt_cb() {
+/**
+ * Import MUTT file.
+ */
+static void addressbook_import_mutt_cb( void ) {
        AddressDataSource *ds = NULL;
        AdapterDSource *ads = NULL;
        AddressBookFile *abf = NULL;
@@ -3843,10 +4375,10 @@ static void addressbook_import_mutt_cb() {
        }
 }
 
-/*
-* Import Pine file.
-*/
-static void addressbook_import_pine_cb() {
+/**
+ * Import Pine file.
+ */
+static void addressbook_import_pine_cb( void ) {
        AddressDataSource *ds = NULL;
        AdapterDSource *ads = NULL;
        AddressBookFile *abf = NULL;
@@ -3881,11 +4413,11 @@ static void addressbook_import_pine_cb() {
        }
 }
 
-/*
+/**
  * Harvest addresses.
- * Enter: folderItem Folder to import.
- *        sourceInd  Source indicator: FALSE - Folder, TRUE - Messages.
- *        msgList    List of message numbers, or NULL to process folder.
+ * \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 )
@@ -3918,9 +4450,9 @@ void addressbook_harvest(
        }
 }
 
-/*
-* Export HTML file.
-*/
+/**
+ * Export HTML file.
+ */
 static void addressbook_export_html_cb( void ) {
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
        AddressObject *obj;
@@ -3942,6 +4474,281 @@ static void addressbook_export_html_cb( void ) {
        addressbook_exp_html( cache );
 }
 
+/**
+ * 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;
+
+       ds = addressbook_find_datasource( node );
+       if( ds == NULL ) return;
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
+       addressbook_exp_ldif( cache );
+}
+
+static void addressbook_start_drag(GtkWidget *widget, gint button, 
+                                  GdkEvent *event,
+                                  void *data)
+{
+       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);
+}
+
+static GSList *dragged_persons = NULL;
+static ItemFolder *dragged_folder = NULL;
+static AddressBookFile *dragged_ab = NULL;
+
+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;
+
+       pobj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       if( pobj == NULL ) return;
+
+       if( pobj->type == ADDR_DATASOURCE ) {
+               ads = ADAPTER_DSOURCE(pobj);
+               ds = ads->dataSource;
+       } else if (pobj->type == ADDR_ITEM_GROUP) {
+               return;
+       }
+       
+       else if( pobj->type != ADDR_INTERFACE ) {
+               ds = addressbook_find_datasource( addrbook.treeSelected );
+               if (!ds)
+                       return;
+       }
+       
+
+       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);
+               }
+       }
+
+       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 gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
+                                         GdkDragContext *context,
+                                         gint            x,
+                                         gint            y,
+                                         guint           time,
+                                         void            *data)
+{
+       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));
+
+               if (y < 24 && y > 0)
+                       gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
+               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;
+
+                       }
+               }
+       }
+
+       
+       if (acceptable) {
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+               gtk_ctree_select(GTK_CTREE(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 acceptable;
+}
+
+static void addressbook_drag_leave_cb(GtkWidget      *widget,
+                                    GdkDragContext *context,
+                                    guint           time,
+                                    void           *data)
+{
+       if (addrbook.treeSelected) {
+               g_signal_handlers_block_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+               gtk_ctree_select(GTK_CTREE(widget), addrbook.treeSelected);
+               g_signal_handlers_unblock_by_func
+                       (G_OBJECT(widget),
+                        G_CALLBACK(addressbook_tree_selected), NULL);
+       }
+}
+
+static void addressbook_drag_received_cb(GtkWidget        *widget,
+                                       GdkDragContext   *drag_context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *data,
+                                       guint             info,
+                                       guint             time,
+                                       void             *pdata)
+{
+       gint row, column;
+       GtkCTreeNode *node;
+       ItemFolder *afolder = NULL;
+       ItemFolder *ofolder = NULL;
+       ItemPerson *person = NULL;
+       
+
+       if (!strcmp(data->data, "Dummy_addr")) {
+               AddressObject *obj = NULL;
+               AdapterDSource *ads = NULL;
+               AddressDataSource *ds = NULL;
+               GSList *cur = dragged_persons;
+
+               if (gtk_clist_get_selection_info
+                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0) {
+                       goto free_list;
+               }
+       
+               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;
+               }
+
+               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) {
+                               person = (ItemPerson *)cur->data;
+                               addritem_folder_remove_person(ofolder, person);
+                               addritem_folder_add_person(afolder, person);
+                       }
+                       addressbook_list_select_clear();
+                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened);
+                                                       
+                       if (abook) {
+                               addrbook_set_dirty(abook, TRUE);
+                       }
+                       if (obook) {
+                               addrbook_set_dirty(obook, TRUE);
+                       }
+                       
+                       addressbook_export_to_file();
+               }
+
+               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+       }
+free_list:
+       g_slist_free(dragged_persons);
+       dragged_persons = NULL;
+}
+
 /*
 * End of Source.
 */