2006-03-19 [colin] 2.0.0cvs156
[claws.git] / src / addressbook.c
index 592bd2555b120466c10c269ef6cfcf8fa8da5a4c..159072f8ff318f53c4193159811d0124b5f9f8d9 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "expldifdlg.h"
 #include "browseldap.h"
 
+typedef enum
+{
+       COL_SOURCES     = 0,
+       N_INDEX_COLS    = 1
+} AddressIndexColumns;
+
 typedef enum
 {
        COL_NAME        = 0,
        COL_ADDRESS     = 1,
-       COL_REMARKS     = 2
-} AddressBookColumnPos;
+       COL_REMARKS     = 2,
+       N_LIST_COLS     = 3
+} AddressListColumns;
+
+static gchar *list_titles[] = { N_("Name"),
+                                N_("Email Address"),
+                                N_("Remarks") };
 
-#define N_COLS 3
 #define COL_NAME_WIDTH         164
 #define COL_ADDRESS_WIDTH      156
 
@@ -174,7 +184,7 @@ static void addressbook_lup_clicked         (GtkButton      *button,
 static void addressbook_close_clicked          (GtkButton      *button,
                                                 gpointer       data);
 
-static gboolean addressbook_tree_selected      (GtkCTree       *ctree,
+static void addressbook_tree_selected          (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 gint            column,
                                                 gpointer        data);
@@ -197,10 +207,6 @@ static void addressbook_person_collapse_node       (GtkCTree       *ctree,
                                                 GList          *node,
                                                 gpointer       *data );
 
-#if 0
-static void addressbook_entry_changed          (GtkWidget      *widget);
-#endif
-
 static gboolean addressbook_list_button_pressed        (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
@@ -213,8 +219,6 @@ static gboolean addressbook_tree_button_pressed     (GtkWidget      *ctree,
 static gboolean addressbook_tree_button_released(GtkWidget     *ctree,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-static void addressbook_popup_close            (GtkMenuShell   *menu_shell,
-                                                gpointer        data);
 
 static void addressbook_new_folder_cb          (gpointer        data,
                                                 guint           action,
@@ -269,7 +273,8 @@ static void addressbook_new_ldap_cb         (gpointer        data,
                                                 GtkWidget      *widget);
 #endif
 
-static void addressbook_set_clist              (AddressObject  *obj);
+static void addressbook_set_clist              (AddressObject  *obj,
+                                                gboolean        refresh);
 
 static void addressbook_load_tree              (void);
 void addressbook_read_file                     (void);
@@ -303,9 +308,6 @@ static gboolean addressbook_entry_key_pressed       (GtkWidget      *widget,
 static gint addressbook_treenode_compare_func  (GtkCList       *clist,
                                                 gconstpointer   ptr1,
                                                 gconstpointer   ptr2);
-static gint addressbook_list_compare_func      (GtkCList       *clist,
-                                                gconstpointer   ptr1,
-                                                gconstpointer   ptr2);
 static void addressbook_folder_load_one_person (GtkCTree *clist, 
                                                 ItemPerson *person,  
                                                 AddressTypeControlItem *atci, 
@@ -317,10 +319,6 @@ static void addressbook_folder_remove_one_person(GtkCTree *clist,
 static void addressbook_folder_remove_node     (GtkCTree *clist, 
                                                 GtkCTreeNode *node);
 
-#ifdef USE_LDAP
-static void addressbook_ldap_show_message      ( LdapServer *server );
-#endif
-
 /* LUT's and IF stuff */
 static void addressbook_free_treenode          ( gpointer data );
 AddressTypeControlItem *addrbookctl_lookup     (gint            ot);
@@ -346,6 +344,7 @@ 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_select_all_cb          ( void );
 static void addressbook_clip_cut_cb            ( void );
 static void addressbook_clip_copy_cb           ( void );
 static void addressbook_clip_paste_cb          ( void );
@@ -387,10 +386,11 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
                                        guint             info,
                                        guint             time,
                                        void             *pdata);
+static void addressbook_list_menu_setup( void );
 
 static GtkTargetEntry addressbook_drag_types[] =
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
 static GtkTargetList *addressbook_target_list = NULL;
@@ -406,15 +406,17 @@ static GtkItemFactoryEntry addressbook_entries[] =
        {N_("/_Book/New _JPilot"),      "<control>J",   addressbook_new_jpilot_cb,      0, NULL},
 #endif
 #ifdef USE_LDAP
-       {N_("/_Book/New _Server"),      "<control><shift>S",    addressbook_new_ldap_cb,        0, NULL},
+       {N_("/_Book/New LDAP _Server"), "<control><shift>S",    addressbook_new_ldap_cb,        0, NULL},
 #endif
        {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Book/_Edit book name"),  NULL,           addressbook_treenode_edit_cb,   0, NULL},
+       {N_("/_Book/_Edit book"),       NULL,           addressbook_treenode_edit_cb,   0, NULL},
        {N_("/_Book/_Delete book"),     NULL,           addressbook_treenode_delete_cb, 0, NULL},
        {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
        {N_("/_Book/_Save"),            "<control>S",   addressbook_file_save_cb,       0, NULL},
        {N_("/_Book/_Close"),           "<control>W",   close_cb,                       0, NULL},
        {N_("/_Address"),                       NULL,           NULL, 0, "<Branch>"},
+       {N_("/_Address/_Select all"),   "<control>A",   addressbook_select_all_cb,      0, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
        {N_("/_Address/C_ut"),          "<control>X",   addressbook_clip_cut_cb,        0, NULL},
        {N_("/_Address/_Copy"),         "<control>C",   addressbook_clip_copy_cb,       0, NULL},
        {N_("/_Address/_Paste"),        "<control>V",   addressbook_clip_paste_cb,      0, NULL},
@@ -426,14 +428,14 @@ static GtkItemFactoryEntry addressbook_entries[] =
        {N_("/_Address/New _Group"),    "<control>G",   addressbook_new_group_cb,       0, NULL},
        {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
        {N_("/_Address/_Mail To"),      NULL,           addressbook_mail_to_cb,         0, NULL},
-       {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>"},
+       {N_("/_Tools"),                 NULL,           NULL, 0, "<Branch>"},
        {N_("/_Tools/Import _LDIF file..."), NULL,      addressbook_import_ldif_cb,     0, NULL},
        {N_("/_Tools/Import M_utt file..."), NULL,      addressbook_import_mutt_cb,     0, NULL},
        {N_("/_Tools/Import _Pine file..."), NULL,      addressbook_import_pine_cb,     0, NULL},
        {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>"},
        {N_("/_Tools/Export _HTML..."), NULL,           addressbook_export_html_cb,     0, NULL},
        {N_("/_Tools/Export LDI_F..."), NULL,           addressbook_export_ldif_cb,     0, NULL},
-       {N_("/_Help"),                  NULL,           NULL, 0, "<LastBranch>"},
+       {N_("/_Help"),                  NULL,           NULL, 0, "<Branch>"},
        {N_("/_Help/_About"),           NULL,           about_show, 0, NULL}
 };
 
@@ -451,6 +453,8 @@ static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 
 static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 {
+       {N_("/_Select all"),    NULL, addressbook_select_all_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>"},
@@ -647,6 +651,11 @@ void addressbook_refresh( void )
                if (addrbook.treeSelected) {
                        gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                         addrbook.treeSelected);
+                       addressbook_set_clist(
+                               gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                                       addrbook.treeSelected),
+                               TRUE);
+
                }
        }
        addressbook_export_to_file();
@@ -661,6 +670,90 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
        return FALSE;
 }
 
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void addressbook_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.addressbookwin_width = allocation->width;
+       prefs_common.addressbookwin_height = allocation->height;
+}
+
+static gint list_case_sort(
+       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+{
+       GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
+       GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+       gchar *name1 = NULL, *name2 = NULL;
+
+       if( cell1 ) name1 = cell1->u.text;
+       if( cell2 ) name2 = cell2->u.text;
+       if( ! name1 ) return ( name2 != NULL );
+       if( ! name2 ) return -1;
+       return strcasecmp( name1, name2 );
+}
+
+static void addressbook_sort_list(GtkCList *clist, const gint col,
+               const GtkSortType sort_type)
+{
+       gint pos;
+       GtkWidget *hbox, *label, *arrow;
+
+       gtk_clist_set_compare_func(clist, list_case_sort);
+       gtk_clist_set_sort_type(clist, sort_type);
+       gtk_clist_set_sort_column(clist, col);  
+
+       gtk_clist_freeze(clist);
+       gtk_clist_sort(clist);
+       
+       for(pos = 0 ; pos < N_LIST_COLS ; pos++) {
+               hbox = gtk_hbox_new(FALSE, 4);
+               label = gtk_label_new(list_titles[pos]);
+               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+               
+               if(pos == col) {
+                       arrow = gtk_arrow_new(sort_type == GTK_SORT_ASCENDING ?
+                               GTK_ARROW_DOWN : GTK_ARROW_UP, GTK_SHADOW_IN);
+                       gtk_box_pack_end(GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
+               }
+               
+               gtk_widget_show_all(hbox);
+               gtk_clist_set_column_widget(clist, pos, hbox);
+       }
+       
+       gtk_clist_thaw(clist);  
+}
+
+static void addressbook_name_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+       
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_NAME, sort_type);
+}
+
+static void addressbook_address_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_ADDRESS, sort_type);
+}
+
+static void addressbook_remarks_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_REMARKS, sort_type);
+}
+
 /*
 * Create the address book widgets. The address book contains two CTree widgets: the
 * address index tree on the left and the address list on the right.
@@ -710,33 +803,34 @@ static void addressbook_create(void)
        gint n_entries;
        GList *nodeIf;
 
-       gchar *titles[N_COLS];
-       gchar *dummy_titles[1];
+       gchar *index_titles[N_INDEX_COLS];
        gchar *text;
        gint i;
 
+       static GdkGeometry geometry;
+
        debug_print("Creating addressbook window...\n");
 
-       titles[COL_NAME]    = _("Name");
-       titles[COL_ADDRESS] = _("E-Mail address");
-       titles[COL_REMARKS] = _("Remarks");
-       dummy_titles[0]     = "";
+       index_titles[COL_SOURCES] = _("Sources");
 
+       /* Address book window */
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
-       gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_realize(window);
 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(addressbook_close), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(addressbook_size_allocate_cb), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
 
-       vbox = gtk_vbox_new(FALSE, 4);
+       vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
+       /* Menu bar */
        n_entries = sizeof(addressbook_entries) /
                sizeof(addressbook_entries[0]);
        menubar = menubar_create(window, addressbook_entries, n_entries,
@@ -744,8 +838,8 @@ static void addressbook_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
        menu_factory = gtk_item_factory_from_widget(menubar);
 
-       vbox2 = gtk_vbox_new(FALSE, 4);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+       vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
        gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
 
        ctree_swin = gtk_scrolled_window_new(NULL, NULL);
@@ -755,7 +849,7 @@ static void addressbook_create(void)
        gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
 
        /* Address index */
-       ctree = gtk_sctree_new_with_titles(1, 0, dummy_titles);
+       ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
        gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_clist_set_column_width(GTK_CLIST(ctree), 0, COL_FOLDER_WIDTH);
@@ -800,7 +894,7 @@ static void addressbook_create(void)
        gtk_box_pack_start(GTK_BOX(clist_vbox), clist_swin, TRUE, TRUE, 0);
 
        /* Address list */
-       clist = gtk_sctree_new_with_titles(N_COLS, 0, titles);
+       clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
        gtk_container_add(GTK_CONTAINER(clist_swin), clist);
        gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
        gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
@@ -810,10 +904,16 @@ static void addressbook_create(void)
                                   COL_NAME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
                                   COL_ADDRESS_WIDTH);
-       gtk_clist_set_compare_func(GTK_CLIST(clist),
-                                  addressbook_list_compare_func);
 
-       for (i = 0; i < N_COLS; i++)
+       addressbook_sort_list(clist, COL_NAME, GTK_SORT_ASCENDING);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_NAME].button),
+               "clicked", G_CALLBACK(addressbook_name_clicked), clist);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_ADDRESS].button),
+               "clicked", G_CALLBACK(addressbook_address_clicked), clist);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_REMARKS].button),
+               "clicked", G_CALLBACK(addressbook_remarks_clicked), clist);
+       
+       for (i = 0; i < N_LIST_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
                                       GTK_CAN_FOCUS);
 
@@ -849,11 +949,6 @@ static void addressbook_create(void)
        g_signal_connect(G_OBJECT(entry), "key_press_event",
                         G_CALLBACK(addressbook_entry_key_pressed),
                         NULL);
-#if 0
-       g_signal_connect(G_OBJECT(entry), "changed",
-                        G_CALLBACK(addressbook_entry_changed), NULL);
-#endif
-
        paned = gtk_hpaned_new();
        gtk_box_pack_start(GTK_BOX(vbox2), paned, TRUE, TRUE, 0);
        gtk_paned_add1(GTK_PANED(paned), ctree_swin);
@@ -869,6 +964,7 @@ static void addressbook_create(void)
        hbbox = gtk_hbutton_box_new();
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+       gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
 #if GTK_CHECK_VERSION(2, 6, 0)
@@ -937,6 +1033,8 @@ static void addressbook_create(void)
        addrbookctl_build_iflist();
        addrbookctl_build_ifselect();
 
+       addrbook.clist   = NULL;
+
        /* Add each interface into the tree as a root level folder */
        nodeIf = _addressInterfaceList_;
        while( nodeIf ) {
@@ -948,7 +1046,7 @@ static void addressbook_create(void)
                        AddressTypeControlItem *atci = adapter->atci;
                        text = atci->displayName;
                        adapter->treeNode =
-                               gtk_ctree_insert_node( GTK_CTREE(ctree),
+                               gtk_sctree_insert_node( GTK_CTREE(ctree),
                                        NULL, NULL, &text, FOLDER_SPACING,
                                        interfacexpm, interfacexpmmask,
                                        interfacexpm, interfacexpmmask,
@@ -967,8 +1065,6 @@ static void addressbook_create(void)
                                       n_entries,
                                       "<AddressBookTree>", &tree_factory,
                                       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,
@@ -1004,6 +1100,17 @@ static void addressbook_create(void)
 
        addrbook.listSelected = NULL;
        address_completion_start(window);
+
+       if (!geometry.min_height) {
+               geometry.min_width = ADDRESSBOOK_WIDTH;
+               geometry.min_height = ADDRESSBOOK_HEIGHT;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
+                                   prefs_common.addressbookwin_height);
+
        gtk_widget_show_all(window);
 }
 
@@ -1122,6 +1229,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
 
        /* Test whether anything selected for deletion */
        nodeList = addrbook.listSelected;
+
        aio = gtk_ctree_node_get_row_data( clist, nodeList );
        if( aio == NULL) return;
        ds = addressbook_find_datasource( addrbook.treeSelected );
@@ -1155,13 +1263,14 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        /* Confirm deletion */
        aval = alertpanel( _("Delete address(es)"),
                        _("Really delete the address(es)?"),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
-       if( aval != G_ALERTDEFAULT ) return;
+                       GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+       if( aval != G_ALERTALTERNATE ) return;
 
        /* Process deletions */
        if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
                /* Items inside folders */
                list = addrselect_get_list( _addressSelect_ );
+
                node = list;
                while( node ) {
                        item = node->data;
@@ -1202,10 +1311,16 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                }
                g_list_free( list );
                addressbook_list_select_clear();
-               if( refreshList ) 
+               if( refreshList ) {
                        gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
+                       addressbook_set_clist(
+                               gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                                       addrbook.opened),
+                               TRUE);
+               }
                addrbook_set_dirty(abf, TRUE);
                addressbook_export_to_file();
+               addressbook_list_menu_setup();
                return;
        }
        else if( pobj->type == ADDR_ITEM_GROUP ) {
@@ -1228,8 +1343,14 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                g_list_free( list );
                addressbook_list_select_clear();
                gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
+               addressbook_set_clist(
+                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                               addrbook.opened),
+                       TRUE);
+               
                addrbook_set_dirty(abf, TRUE);
                addressbook_export_to_file();
+               addressbook_list_menu_setup();
                return;
        }
 
@@ -1328,7 +1449,17 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
                }
                else if( aio->type == ADDR_ITEM_GROUP ) {
                        ItemGroup *group = ( ItemGroup * ) aio;
+                       AddressDataSource *ds = NULL;
+                       AddressBookFile *abf = NULL;
                        GList *nodeMail = group->listEMail;
+                       if (nodeMail == NULL) {
+                               if(addrbook.treeSelected ) {
+                                       ds = addressbook_find_datasource( addrbook.treeSelected );
+                                       abf = ds->rawDataSource;
+                                       if( abf != NULL )
+                                               nodeMail = addrbook_get_available_email_list( abf, group );
+                               }
+                       }
                        while( nodeMail ) {
                                ItemEMail *email = nodeMail->data;
 
@@ -1345,14 +1476,14 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
 }
 
 static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
-       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name",   sensitive );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",   sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder",  sensitive );
 
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Select all",    TRUE );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",    sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",   sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",  sensitive );
-/*     menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address",  sensitive ); */
 
        menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Address/New Group",   sensitive );
@@ -1364,6 +1495,7 @@ static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
 
 static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode *node ) {
        gboolean canEdit = FALSE;
+       gboolean canDelete = TRUE;
        gboolean canAdd = FALSE;
        gboolean canEditTr = TRUE;
        gboolean editAddress = FALSE;
@@ -1390,10 +1522,10 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
                ds = ads->dataSource;
                iface = ds->interface;
                if( ! iface->readOnly ) {
-                       canAdd = canEdit = editAddress = TRUE;
+                       canAdd = canEdit = editAddress = canDelete = TRUE;
                }
                if( ! iface->haveLibrary ) {
-                       canAdd = canEdit = editAddress = canExport = FALSE;
+                       canAdd = canEdit = editAddress = canExport = canDelete = FALSE;
                }
        }
        else if( obj->type == ADDR_ITEM_FOLDER ) {
@@ -1402,6 +1534,7 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
                        iface = ds->interface;
                        if( iface->readOnly ) {
                                canEditTr = FALSE;
+                               canDelete = FALSE;
                        }
                        else {
                                canAdd = editAddress = TRUE;
@@ -1428,11 +1561,11 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
 
        /* Enable edit */
        menu_set_sensitive( addrbook.menu_factory, "/Address/Edit",   canEdit );
-       menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
        gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
-       gtk_widget_set_sensitive( addrbook.del_btn, canEdit );
+       gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
 
-       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name",      canEditTr );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",      canEditTr );
        menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book",    canEditTr );
 
        /* Export data */
@@ -1451,7 +1584,7 @@ static void addressbook_list_menu_setup( void );
  * \param column Column number where selected occurred.
  * \param data   Pointer to user data.
  */
-static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
+static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                                      gint column, gpointer data)
 {
        AddressObject *obj = NULL;
@@ -1465,10 +1598,11 @@ static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        addressbook_status_show( "" );
        if( addrbook.entry != NULL ) gtk_entry_set_text(GTK_ENTRY(addrbook.entry), "");
 
-       if( addrbook.clist ) gtk_clist_clear( GTK_CLIST(addrbook.clist) );
        if( node ) obj = gtk_ctree_node_get_row_data( ctree, node );
-       if( obj == NULL ) return FALSE;
-
+       if( obj == NULL ) {
+               addressbook_set_clist(NULL, TRUE);
+               return;
+       }
        addrbook.opened = node;
 
        if( obj->type == ADDR_DATASOURCE ) {
@@ -1476,9 +1610,9 @@ static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                static gboolean tVal = TRUE;
 
                ads = ADAPTER_DSOURCE(obj);
-               if( ads == NULL ) return FALSE;
+               if( ads == NULL ) return;
                ds = ads->dataSource;
-               if( ds == NULL ) return FALSE;          
+               if( ds == NULL ) return;                
 
                if( addrindex_ds_get_modify_flag( ds ) ) {
                        addrindex_ds_read_data( ds );
@@ -1510,10 +1644,18 @@ static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                        addrindex_ds_set_access_flag( ds, &tVal );
                        gtk_ctree_expand( ctree, node );
                }
+       } else {
+               addressbook_set_clist(NULL, TRUE);
        }
 
        /* Update address list */
-       addressbook_set_clist( obj );
+       g_signal_handlers_block_by_func
+               (G_OBJECT(ctree),
+                G_CALLBACK(addressbook_tree_selected), NULL);
+       addressbook_set_clist( obj, FALSE );
+       g_signal_handlers_unblock_by_func
+               (G_OBJECT(ctree),
+                G_CALLBACK(addressbook_tree_selected), NULL);
 
        /* Setup main menu selections */
        addressbook_menubar_set_sensitive( FALSE );
@@ -1521,8 +1663,8 @@ static gboolean addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        addressbook_menuitem_set_sensitive( obj, node );
 
        addressbook_list_select_clear();
-       
-       return FALSE;
+       addressbook_list_menu_setup();
+       return;
 }
 
 /**
@@ -1551,6 +1693,7 @@ static void addressbook_list_menu_setup( void ) {
        if( obj == NULL ) canEdit = FALSE;
 
        menu_set_insensitive_all( GTK_MENU_SHELL(addrbook.list_popup) );
+       menu_set_sensitive( addrbook.list_factory, "/Select all", TRUE );
 
        if( pobj->type == ADDR_DATASOURCE ) {
                /* Parent object is a data source */
@@ -1565,6 +1708,7 @@ static void addressbook_list_menu_setup( void ) {
                        if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
                        if( obj ) canEdit = TRUE;
                }
+               canDelete = canEdit;
        }
        else if( pobj->type != ADDR_INTERFACE ) {
                /* Parent object is not an interface */
@@ -1584,15 +1728,16 @@ static void addressbook_list_menu_setup( void ) {
                        }
                        if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
                        if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+                       canDelete = canEdit;
                }
                if( iface->type == ADDR_IF_LDAP ) {
                        if( obj ) canBrowse = TRUE;
+                       canEdit = TRUE;
+                       canDelete = FALSE;
                }
        }
        if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
 
-       canDelete = canEdit;
-
        /* Disable edit or browse if more than one row selected */
        if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
                canEdit = FALSE;
@@ -1672,6 +1817,10 @@ static void addressbook_treenode_add_list(
        }
 }
 
+static void addressbook_select_all_cb( void ) {
+       gtk_clist_select_all(GTK_CLIST(addrbook.clist));
+}
+
 /**
  * Cut from address list widget.
  */
@@ -1757,76 +1906,14 @@ static void addressbook_clip_paste_cb( void ) {
 
        /* Display items pasted */
        gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
+       addressbook_set_clist(
+               gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                       addrbook.opened),
+               TRUE);
+       
 
 }
 
-#if 0
-/**
- * Paste clipboard email addresses only into address list widget.
- */
-static void addressbook_clip_paste_address_cb( void ) {
-       GtkCTree *clist = GTK_CTREE(addrbook.clist);
-       GtkCTree *ctree;
-       AddressObject *pobj = NULL;
-       AddressDataSource *ds = NULL;
-       AddressBookFile *abf = NULL;
-       ItemFolder *folder = NULL;
-       AddrItemObject *aio;
-       gint cnt;
-
-       if( addrbook.listSelected == NULL ) return;
-
-               ctree = GTK_CTREE( addrbook.ctree );
-       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
-       if( ds == NULL ) return;
-       if( addrindex_ds_get_readonly( ds ) ) {
-               addressbook_ds_status_message(
-                       ds, _( "Cannot paste. Target address book is readonly." ) );
-               return;
-       }
-
-       pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
-       if( pobj ) {
-               if( pobj->type == ADDR_ITEM_FOLDER ) {
-                       folder = ADAPTER_FOLDER(pobj)->itemFolder;
-               }
-       }
-
-       abf = addressbook_get_book_file();
-       if( abf == NULL ) return;
-
-       cnt = 0;
-       aio = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
-       if( aio->type == ADDR_ITEM_PERSON ) {
-               ItemPerson *person;
-
-               person = ( ItemPerson * ) aio;
-               if( _clipBoard_->cutFlag ) {
-                       /* Paste/Cut */
-                       cnt = addrclip_paste_person_cut( _clipBoard_, abf, person );
-
-                       /* Remove all "cut" items */
-                       addrclip_delete_address( _clipBoard_ );
-
-                       /* Clear clipboard */
-                       addrclip_clear( _clipBoard_ );
-               }
-               else {
-                       /* Paste/Copy */
-                       cnt = addrclip_paste_person_copy( _clipBoard_, abf, person );
-               }
-               if( cnt > 0 ) {
-                       addritem_person_set_opened( person, TRUE );
-               }
-       }
-
-       /* Display items pasted */
-       if( cnt > 0 ) {
-               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
-       }
-}
-#endif
-
 /**
  * Add current treenode object to clipboard. Note that widget only allows
  * one entry from the tree list to be selected.
@@ -2060,7 +2147,6 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        addressbook_menubar_set_sensitive( FALSE );
 
        if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
-               gtk_clist_select_row( clist, row, column );
                gtkut_clist_set_focus_row(clist, row);
                obj = gtk_clist_get_row_data( clist, row );
        }
@@ -2076,7 +2162,11 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        if (obj->type == ADDR_DATASOURCE) {
                ads = ADAPTER_DSOURCE(obj);
                ds = ads->dataSource;
+               if (!ds)
+                       goto just_set_sens;
                iface = ds->interface;
+               if (!iface)
+                       goto just_set_sens;
                canEdit = TRUE;
                canDelete = TRUE;
                if( iface->readOnly ) {
@@ -2091,7 +2181,11 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        }
        else if (obj->type == ADDR_ITEM_FOLDER) {
                ds = addressbook_find_datasource( addrbook.treeSelected );
+               if (!ds)
+                       goto just_set_sens;
                iface = ds->interface;
+               if (!iface)
+                       goto just_set_sens;
                if( iface->readOnly ) {
                        canTreePaste = FALSE;
                }
@@ -2103,7 +2197,7 @@ static gboolean 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;
@@ -2112,11 +2206,15 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        }
        else if (obj->type == ADDR_ITEM_GROUP) {
                ds = addressbook_find_datasource( addrbook.treeSelected );
+               if (!ds)
+                       goto just_set_sens;
                iface = ds->interface;
+               if (!iface)
+                       goto just_set_sens;
                if( ! iface->readOnly ) {
                        canEdit = TRUE;
                        canDelete = TRUE;
-                       menu_set_sensitive( addrbook.tree_factory, "/New Address", TRUE );
+                       menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
        }
@@ -2130,6 +2228,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
        if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
 
+just_set_sens:
        /* Enable edit */
        menu_set_sensitive( addrbook.tree_factory, "/Edit",   canEdit );
        menu_set_sensitive( addrbook.tree_factory, "/Delete", canDelete );
@@ -2137,7 +2236,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        menu_set_sensitive( addrbook.tree_factory, "/Copy",   canTreeCopy );
        menu_set_sensitive( addrbook.tree_factory, "/Paste",  canTreePaste );
 
-       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name",          canEdit );
+       menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book",          canEdit );
        menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book",        canEdit );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",           canCut );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",          canCopy );
@@ -2157,20 +2256,10 @@ static gboolean addressbook_tree_button_released(GtkWidget *ctree,
                                                 GdkEventButton *event,
                                                 gpointer data)
 {
-       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
        gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
        return FALSE;
 }
 
-static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
-{
-       if (!addrbook.opened) return;
-
-       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
-       gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
-                                 addrbook.opened);
-}
-
 static void addressbook_new_folder_cb(gpointer data, guint action,
                                      GtkWidget *widget)
 {
@@ -2206,7 +2295,7 @@ static void addressbook_new_folder_cb(gpointer data, guint action,
                        addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
                gtk_ctree_expand( ctree, addrbook.treeSelected );
                if( addrbook.treeSelected == addrbook.opened )
-                       addressbook_set_clist(obj);
+                       addressbook_set_clist(obj, TRUE);
        }
 
 }
@@ -2245,7 +2334,7 @@ static void addressbook_new_group_cb(gpointer data, guint action,
                nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
                gtk_ctree_expand( ctree, addrbook.treeSelected );
                if( addrbook.treeSelected == addrbook.opened )
-                       addressbook_set_clist(obj);
+                       addressbook_set_clist(obj, TRUE);
        }
 
 }
@@ -2262,7 +2351,7 @@ static void addressbook_change_node_name(GtkCTreeNode *node, const gchar *name)
        gtk_ctree_get_node_info(ctree, node, text, &spacing,
                                &pix_cl, &mask_cl, &pix_op, &mask_op,
                                &is_leaf, &expanded);
-       gtk_ctree_set_node_info(ctree, node, name, spacing,
+       gtk_sctree_set_node_info(ctree, node, name, spacing,
                                pix_cl, mask_cl, pix_op, mask_op,
                                is_leaf, expanded);
 }
@@ -2438,34 +2527,35 @@ static void addressbook_treenode_delete_cb(
                                "results and addresses in '%s' ?" ),
                                obj->name );
                        aval = alertpanel( _("Delete"), message,
-                               GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+                               GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
                        g_free(message);
-                       if( aval == G_ALERTDEFAULT ) {
+                       if( aval == G_ALERTALTERNATE ) {
                                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." ),
+                               ( _( "Do you want to delete '%s' ?"
+                                    "If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
                                 obj->name );
                        aval = alertpanel( _("Delete folder"), message,
-                               _("_Folder only"), _("Folder and _addresses"),
-                               GTK_STOCK_CANCEL );
+                               GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
                        g_free(message);
-                       if( aval == G_ALERTDEFAULT ) {
+                       if( aval == G_ALERTALTERNATE ) {
                                delType = ADDRTREE_DEL_FOLDER_ONLY;
                        }
-                       else if( aval == G_ALERTALTERNATE ) {
+                       else if( aval == G_ALERTOTHER ) {
                                delType = ADDRTREE_DEL_FOLDER_ADDR;
                        }
                }
        }
        else {
-               message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
-               aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+               message = g_strdup_printf(_("Do you want to delete '%s'?\n"
+                                           "The addresses it contains will be lost."), obj->name);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL, 
+                               "+" GTK_STOCK_DELETE, NULL);
                g_free(message);
-               if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
+               if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
        }
        if( delType == ADDRTREE_DEL_NONE ) return;
 
@@ -2574,6 +2664,10 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                if( person ) {
                        if (addrbook.treeSelected == addrbook.opened) {
                                gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+                               addressbook_set_clist(
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                                               addrbook.opened),
+                                       TRUE);
                        }
                }
        }
@@ -2585,6 +2679,10 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                        /* Change node name in tree. */
                        addressbook_change_node_name( addrbook.treeSelected, ADDRITEM_NAME(group) );
                        gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+                       addressbook_set_clist(
+                               gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                                       addrbook.opened),
+                               TRUE);
                }
        }
 }
@@ -2626,16 +2724,6 @@ 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;
@@ -2683,7 +2771,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
        if( ds == NULL ) return;
 
        abf = addressbook_get_book_file();
-       if( abf == NULL ) return;
+       
        if( obj->type == ADDR_ITEM_EMAIL ) {
                ItemEMail *email = ( ItemEMail * ) obj;
                if( email == NULL ) return;
@@ -2691,6 +2779,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                        /* Edit parent group */
                        AdapterGroup *adapter = ADAPTER_GROUP(pobj);
                        ItemGroup *itemGrp = adapter->itemGroup;
+                       if( abf == NULL ) return;
                        if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
                        name = ADDRITEM_NAME(itemGrp);
                        node = addrbook.treeSelected;
@@ -2730,12 +2819,18 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
        addressbook_change_node_name( node, name );
        gtk_sctree_sort_node( ctree, parentNode );
        gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened ); 
+       addressbook_set_clist(
+               gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                       addrbook.opened),
+               TRUE);
 }
 
 static void addressbook_delete_address_cb(gpointer data, guint action,
                                          GtkWidget *widget)
 {
+       gtk_clist_freeze(GTK_CLIST(addrbook.clist));
        addressbook_del_clicked(NULL, NULL);
+       gtk_clist_thaw(GTK_CLIST(addrbook.clist));
 }
 
 static void close_cb(gpointer data, guint action, GtkWidget *widget)
@@ -2780,7 +2875,7 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
        AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
        for( ; items != NULL; items = g_list_next( items ) ) {
                GtkCTreeNode *nodeEMail = NULL;
-               gchar *text[N_COLS];
+               gchar *text[N_LIST_COLS];
                ItemEMail *email = items->data;
                ItemPerson *person;
                gchar *str = NULL;
@@ -2797,7 +2892,7 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
                }
                text[COL_ADDRESS] = email->address;
                text[COL_REMARKS] = email->remarks;
-               nodeEMail = gtk_ctree_insert_node(
+               nodeEMail = gtk_sctree_insert_node(
                                clist, NULL, NULL,
                                text, FOLDER_SPACING,
                                atci->iconXpm, atci->maskXpm,
@@ -2816,7 +2911,7 @@ static void addressbook_folder_load_one_person(
 {
        GtkCTreeNode *nodePerson = NULL;
        GtkCTreeNode *nodeEMail = NULL;
-       gchar *text[N_COLS];
+       gchar *text[N_LIST_COLS];
        gboolean flgFirst = TRUE, haveAddr = FALSE;
        GList *node;
 
@@ -2842,7 +2937,7 @@ static void addressbook_folder_load_one_person(
                        else {
                                text[COL_NAME] = ADDRITEM_NAME(person);
                        }
-                       nodePerson = gtk_ctree_insert_node(
+                       nodePerson = gtk_sctree_insert_node(
                                        clist, NULL, NULL,
                                        text, FOLDER_SPACING,
                                        atci->iconXpm, atci->maskXpm,
@@ -2855,7 +2950,7 @@ static void addressbook_folder_load_one_person(
                else {
                        /* Subsequent email is a child node of person */
                        text[COL_NAME] = ADDRITEM_NAME(email);
-                       nodeEMail = gtk_ctree_insert_node(
+                       nodeEMail = gtk_sctree_insert_node(
                                        clist, nodePerson, NULL,
                                        text, FOLDER_SPACING,
                                        atciMail->iconXpm, atciMail->maskXpm,
@@ -2871,7 +2966,7 @@ static void addressbook_folder_load_one_person(
                text[COL_NAME] = ADDRITEM_NAME(person);
                text[COL_ADDRESS] = NULL;
                text[COL_REMARKS] = NULL;
-               nodePerson = gtk_ctree_insert_node(
+               nodePerson = gtk_sctree_insert_node(
                                clist, NULL, NULL,
                                text, FOLDER_SPACING,
                                atci->iconXpm, atci->maskXpm,
@@ -2953,13 +3048,13 @@ static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFold
        items = addritem_folder_get_group_list( itemFolder );
        for( ; items != NULL; items = g_list_next( items ) ) {
                GtkCTreeNode *nodeGroup = NULL;
-               gchar *text[N_COLS];
+               gchar *text[N_LIST_COLS];
                ItemGroup *group = items->data;
                if( group == NULL ) continue;
                text[COL_NAME] = ADDRITEM_NAME(group);
                text[COL_ADDRESS] = NULL;
                text[COL_REMARKS] = NULL;
-               nodeGroup = gtk_ctree_insert_node(clist, NULL, NULL,
+               nodeGroup = gtk_sctree_insert_node(clist, NULL, NULL,
                                      text, FOLDER_SPACING,
                                      atci->iconXpm, atci->maskXpm,
                                      atci->iconXpmOpen, atci->maskXpmOpen,
@@ -3091,12 +3186,20 @@ static AddressDataSource *addressbook_find_datasource( GtkCTreeNode *node ) {
  * Load address list widget with children of specified object.
  * \param obj Parent object to be loaded.
  */
-static void addressbook_set_clist( AddressObject *obj ) {
+static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
        GtkCTree *ctreelist = GTK_CTREE(addrbook.clist);
        GtkCList *clist = GTK_CLIST(addrbook.clist);
        AddressDataSource *ds = NULL;
        AdapterDSource *ads = NULL;
+       static AddressObject *last_obj = NULL;
+
+       if (addrbook.clist == NULL) {
+               return;
+       }
+       if (obj == last_obj && !refresh)
+               return;
 
+       last_obj = obj;
        if( obj == NULL ) {
                gtk_clist_clear(clist);
                return;
@@ -3277,7 +3380,7 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
                        }
                        else {
                                msg = _("Old address book converted,\n"
-                                       "could not save new address index file" );
+                                       "could not save new address index file." );
                        }
                }
                else {
@@ -3296,7 +3399,7 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
                                }
                                else {
                                        msg = _("Could not convert address book,\n"
-                                               "could not create new address book files." );
+                                               "could not save new address index file." );
                                }
                        }
                        else {
@@ -3396,7 +3499,7 @@ static GtkCTreeNode *addressbook_add_object(GtkCTreeNode *node,
                        /* Add object to tree */
                        gchar **name;
                        name = &obj->name;
-                       added = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+                       added = gtk_sctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
                                atci->iconXpm, atci->maskXpm, atci->iconXpmOpen, atci->maskXpmOpen,
                                atci->treeLeaf, atci->treeExpand );
                        gtk_ctree_node_set_row_data_full( ctree, added, obj,
@@ -3438,7 +3541,7 @@ static GtkCTreeNode *addressbook_node_add_group(
        ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemGroup) );
        adapter->itemGroup = itemGroup;
 
-       newNode = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+       newNode = gtk_sctree_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,
@@ -3491,7 +3594,7 @@ static GtkCTreeNode *addressbook_node_add_folder(
                adapter->itemFolder = itemFolder;
 
                name = ADDRITEM_NAME(itemFolder);
-               newNode = gtk_ctree_insert_node( ctree, node, NULL, &name, FOLDER_SPACING,
+               newNode = gtk_sctree_insert_node( ctree, node, NULL, &name, FOLDER_SPACING,
                                atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
                                atci->treeLeaf, atci->treeExpand );
                if( newNode ) {
@@ -3557,38 +3660,6 @@ static gint addressbook_treenode_compare_func(
        return g_utf8_collate( name1, name2 );
 }
 
-/*
-* Comparison using object names and types.
-*/
-static gint addressbook_list_compare_func(
-       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
-{
-       AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
-       AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
-       gchar *name1 = NULL, *name2 = NULL;
-
-       /* Order by cell contents */
-       name1 = ADDRITEM_NAME( aio1 );
-       name2 = ADDRITEM_NAME( aio2 );
-
-       if( aio1->type == aio2->type ) {
-               /* Order by name */
-               if( ! name1 ) return ( name2 != NULL );
-               if( ! name2 ) return -1;
-               return g_utf8_collate( name1, name2 );
-       }
-       else {
-               /* Order groups before person */
-               if( aio1->type == ITEMTYPE_GROUP ) {
-                       return -1;
-               }
-               else if( aio2->type == ITEMTYPE_GROUP ) {
-                       return 1;
-               }
-               return 0;
-       }
-}
-
 static void addressbook_new_book_cb( gpointer data, guint action, GtkWidget *widget ) {
        AdapterDSource *ads;
        AdapterInterface *adapter;
@@ -3704,7 +3775,7 @@ static void addressbook_refresh_current( void ) {
        ctree = GTK_CTREE(addrbook.ctree);
        obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
        if( obj == NULL ) return;
-       addressbook_set_clist( obj );
+       addressbook_set_clist( obj, TRUE );
 }
 
 /**
@@ -3895,6 +3966,7 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
                parentNode = node;
        }
        addressbook_perform_search( ds, searchTerm, parentNode );
+       
        gtk_widget_grab_focus( addrbook.entry );
 
        g_free( searchTerm );
@@ -4155,7 +4227,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        atci->maskXpm = ldapxpmmask;
        atci->iconXpmOpen = ldapxpm;
        atci->maskXpmOpen = ldapxpmmask;
-       atci->menuCommand = "/Book/New Server";
+       atci->menuCommand = "/Book/New LDAP Server";
        g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
        _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
 
@@ -4271,18 +4343,6 @@ void addrbookctl_build_iflist( void ) {
        }
 }
 
-#if 0
-void addrbookctl_free_selection( GList *list ) {
-       GList *node = list;
-       while( node ) {
-               AdapterInterface *adapter = node->data;
-               adapter = NULL;
-               node = g_list_next( node );
-       }
-       g_list_free( list );
-}
-#endif
-
 /**
  * Find GUI interface type specified interface type.
  * \param  ifType Interface type.
@@ -4579,10 +4639,6 @@ static void addressbook_start_drag(GtkWidget *widget, gint button,
        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,
@@ -4597,61 +4653,42 @@ static void addressbook_drag_data_get(GtkWidget        *widget,
        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), 
+               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,
+               if( ds && ds->interface && ds->interface->readOnly)
+                       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;
-       }
+                                      "Dummy_addr_copy", 15);
+               else
+                       gtk_selection_data_set(selection_data,
+                                      selection_data->target, 8,
+                                      "Dummy_addr_move", 15);
+       } 
 }
 
 static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
@@ -4690,18 +4727,15 @@ static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
                                AdapterDSource *ads = NULL;
                                AddressDataSource *ds = NULL;
                                ads = ADAPTER_DSOURCE(obj);
-                               if (ads == NULL ) return FALSE;
+                               if (ads == NULL ){ return FALSE;}
                                ds = ads->dataSource;
-                               if (ds == NULL ) return FALSE;
-                               if (obj->type == ADDR_DATASOURCE
-                               &&  !ds->interface->externalQuery)
-                                       acceptable = TRUE;
+                               if (ds == NULL ) { return FALSE;}
 
+                               acceptable = TRUE;
                        }
                }
        }
 
-       
        if (acceptable) {
                g_signal_handlers_block_by_func
                        (G_OBJECT(widget),
@@ -4729,11 +4763,12 @@ static void addressbook_drag_leave_cb(GtkWidget      *widget,
                g_signal_handlers_block_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
-               gtk_sctree_select( GTK_SCTREE(widget), addrbook.treeSelected);
+               gtk_sctree_select( GTK_SCTREE(widget), addrbook.opened);
                g_signal_handlers_unblock_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
        }
+       
 }
 
 static void addressbook_drag_received_cb(GtkWidget        *widget,
@@ -4747,80 +4782,30 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
 {
        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;
+       GtkCTreeNode *lastopened = addrbook.opened;
 
+       if (!strncmp(data->data, "Dummy_addr", 10)) {
                if (gtk_clist_get_selection_info
                        (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0) {
-                       goto free_list;
+                       return;
                }
-       
+               
                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( !node || !gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), node)) 
+                       return;
                
-               if (afolder && ofolder) {
-                       AddressBookFile *obook = dragged_ab;
-                       AddressBookFile *abook = addressbook_get_book_file_for_node(node);
-                       for (cur = dragged_persons; cur; cur = cur->next) {
-                               AddrBookBase *adbase = ( AddrBookBase * ) ds ? ds->rawDataSource : NULL;
-                               AddressCache *cache = (adbase) ? adbase->addressCache : NULL;
-
-                               person = (ItemPerson *)cur->data;
-                               addritem_folder_remove_person(ofolder, person);
-                               if (cache) {
-                                       addrcache_folder_add_person(cache, afolder, person);
-                               } else {
-                                       addritem_folder_add_person(afolder, person);
-                               }
-                       }
-                       addressbook_list_select_clear();
-                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
-                                                       
-                       if (abook) {
-                               addrbook_set_dirty(abook, TRUE);
-                       }
-                       if (obook) {
-                               addrbook_set_dirty(obook, TRUE);
-                       }
-                       
-                       addressbook_export_to_file();
-               }
-
+               gtk_clist_freeze(GTK_CLIST(addrbook.clist));
+               if (drag_context->action == GDK_ACTION_COPY || 
+                   !strcmp(data->data, "Dummy_addr_copy"))
+                       addressbook_clip_copy_cb();
+               else
+                       addressbook_clip_cut_cb();
+               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), node);
+               addressbook_clip_paste_cb();
+               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), lastopened);
+               gtk_clist_thaw(GTK_CLIST(addrbook.clist));
                gtk_drag_finish(drag_context, TRUE, TRUE, time);
        }
-free_list:
-       g_slist_free(dragged_persons);
-       dragged_persons = NULL;
 }
 
 /*