2007-01-18 [wwp] 2.7.1cvs23
[claws.git] / src / addressbook.c
index e4e789f21caad0c5fb464a1da0ee13131b50c358..7d3ba971140a3400ee6436a8f7c9fbe981bce168 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,6 +69,7 @@
 #include "addrbook.h"
 #include "addrindex.h"
 #include "addressadd.h"
+#include "addressbook_foldersel.h"
 #include "vcard.h"
 #include "editvcard.h"
 #include "editgroup.h"
@@ -77,6 +78,7 @@
 #include "importldif.h"
 #include "importmutt.h"
 #include "importpine.h"
+#include "manual.h"
 
 #ifdef USE_JPILOT
 #include "jpilot.h"
@@ -114,6 +116,23 @@ typedef enum
        N_LIST_COLS     = 3
 } AddressListColumns;
 
+typedef struct {
+       AddressBookFile *book;
+       ItemFolder      *folder;
+} FolderInfo;
+
+typedef struct {
+       gchar **folder_path;
+       gboolean matched;
+       gint index;
+       AddressDataSource *book;
+       ItemFolder *folder;
+} FolderPathMatch;
+
+static gchar *list_titles[] = { N_("Name"),
+                                N_("Email Address"),
+                                N_("Remarks") };
+
 #define COL_NAME_WIDTH         164
 #define COL_ADDRESS_WIDTH      156
 
@@ -168,6 +187,9 @@ static void addressbook_create                      (void);
 static gint addressbook_close                  (void);
 static void addressbook_button_set_sensitive   (void);
 
+static gboolean address_index_has_focus = FALSE;
+static gboolean address_list_has_focus = FALSE;
+
 /* callback functions */
 static void addressbook_del_clicked            (GtkButton      *button,
                                                 gpointer        data);
@@ -203,10 +225,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);
@@ -308,9 +326,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, 
@@ -322,6 +337,9 @@ static void addressbook_folder_remove_one_person(GtkCTree *clist,
 static void addressbook_folder_remove_node     (GtkCTree *clist, 
                                                 GtkCTreeNode *node);
 
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+                                                                         gboolean force_focus );
+
 /* LUT's and IF stuff */
 static void addressbook_free_treenode          ( gpointer data );
 AddressTypeControlItem *addrbookctl_lookup     (gint            ot);
@@ -393,7 +411,7 @@ static void addressbook_list_menu_setup( void );
 
 static GtkTargetEntry addressbook_drag_types[] =
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
 static GtkTargetList *addressbook_target_list = NULL;
@@ -446,9 +464,11 @@ static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 {
        {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL},
        {N_("/_Delete"),        NULL, addressbook_treenode_delete_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
+       {N_("/New _Book"),      NULL, addressbook_new_book_cb,      0, NULL},
        {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
+       {"/---",                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}
@@ -457,17 +477,17 @@ 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>"},
+       {"/---",                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>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
        {N_("/New _Address"),   NULL, addressbook_new_address_cb,    0, NULL},
        {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
+       {"/---",                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>"},
+       {"/---",                NULL, NULL, 0, "<Separator>"},
 /*     {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
        {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL},
 #ifdef USE_LDAP
@@ -610,6 +630,11 @@ void addressbook_open(Compose *target)
        }
 
        gtk_widget_show_all(addrbook.window);
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_widgetset_hide();
+
+       address_completion_start(addrbook.window);
+
        addressbook_show_buttons(target == NULL, lastCanLookup, target != NULL);
        addressbook_set_target_compose(target);
 }
@@ -668,8 +693,11 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
 {
        if (event && event->keyval == GDK_Escape)
                addressbook_close();
-       else if (event && event->keyval == GDK_Delete)
-               addressbook_del_clicked(NULL, NULL);
+       else if (event && event->keyval == GDK_Delete) {
+               /* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
+               if ( /* address_index_has_focus || */ address_list_has_focus )
+                       addressbook_del_clicked(NULL, NULL);
+       }
        return FALSE;
 }
 
@@ -685,6 +713,134 @@ static void addressbook_size_allocate_cb(GtkWidget *widget,
        prefs_common.addressbookwin_height = allocation->height;
 }
 
+static gint sort_column_number = 0;
+static GtkSortType sort_column_type = GTK_SORT_ASCENDING;
+
+static gint list_case_sort(
+       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+{
+       GtkCListRow *row1 = (GtkCListRow *) ptr1;
+       GtkCListRow *row2 = (GtkCListRow *) ptr2;
+       gchar *name1 = NULL, *name2 = NULL;
+       AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
+       AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
+
+       if( aio1->type == aio2->type ) {
+               if( row1 ) 
+                       name1 = GTK_CELL_TEXT (row1->cell[sort_column_number])->text;
+               if( row2 ) 
+                       name2 = GTK_CELL_TEXT (row2->cell[sort_column_number])->text;
+               if( ! name1 ) return ( name2 != NULL );
+               if( ! name2 ) return -1;
+               return strcasecmp( name1, name2 );
+       } else {
+               /* Order groups before person */
+               if( aio1->type == ITEMTYPE_GROUP ) {
+                       return (sort_column_type==GTK_SORT_ASCENDING) ? -1:+1;
+               } else if( aio2->type == ITEMTYPE_GROUP ) {
+                       return (sort_column_type==GTK_SORT_ASCENDING) ? +1:-1;
+               }
+               return 0;
+       }
+}
+
+static void addressbook_sort_list(GtkCList *clist, const gint col,
+               const GtkSortType sort_type)
+{
+       gint pos;
+       GtkWidget *hbox, *label, *arrow;
+
+       sort_column_number = col;
+       sort_column_type = sort_type;
+       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(gettext(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);
+}
+
+static gboolean addressbook_address_index_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_index_has_focus = TRUE;
+       return FALSE;
+}
+
+static gboolean addressbook_address_index_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_index_has_focus = FALSE;
+       return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_list_has_focus = TRUE;
+       return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_list_has_focus = FALSE;
+       return FALSE;
+}
+
+/* save hpane and vpane's handle position when it moves */
+static void addressbook_pane_notify_position(GObject *gobject,
+                                                                                       GParamSpec      *arg1,
+                                            gpointer    user_data)
+{
+       prefs_common.addressbook_hpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.hpaned));
+       prefs_common.addressbook_vpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.vpaned));
+}
+
 /*
 * 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.
@@ -708,16 +864,19 @@ static void addressbook_create(void)
        GtkWidget *vbox2;
        GtkWidget *ctree_swin;
        GtkWidget *ctree;
+       GtkWidget *editaddress_vbox;
        GtkWidget *clist_vbox;
        GtkWidget *clist_swin;
        GtkWidget *clist;
-       GtkWidget *paned;
+       GtkWidget *hpaned;
+       GtkWidget *vpaned;
        GtkWidget *hbox;
        GtkWidget *label;
        GtkWidget *entry;
        GtkWidget *statusbar;
        GtkWidget *hbbox;
        GtkWidget *hsbox;
+       GtkWidget *help_btn;
        GtkWidget *del_btn;
        GtkWidget *edit_btn;
        GtkWidget *reg_btn;
@@ -735,7 +894,6 @@ static void addressbook_create(void)
        GList *nodeIf;
 
        gchar *index_titles[N_INDEX_COLS];
-       gchar *list_titles[N_LIST_COLS];
        gchar *text;
        gint i;
 
@@ -744,9 +902,6 @@ static void addressbook_create(void)
        debug_print("Creating addressbook window...\n");
 
        index_titles[COL_SOURCES] = _("Sources");
-       list_titles[COL_NAME]    = _("Name");
-       list_titles[COL_ADDRESS] = _("E-Mail address");
-       list_titles[COL_REMARKS] = _("Remarks");
 
        /* Address book window */
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -781,7 +936,7 @@ static void addressbook_create(void)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
+       gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 20, -1);
 
        /* Address index */
        ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
@@ -819,6 +974,10 @@ static void addressbook_create(void)
        g_signal_connect(G_OBJECT(ctree), "drag_data_received",
                         G_CALLBACK(addressbook_drag_received_cb),
                         ctree);
+       g_signal_connect(G_OBJECT(ctree), "focus_in_event",
+               G_CALLBACK(addressbook_address_index_focus_evt_in), NULL);
+       g_signal_connect(G_OBJECT(ctree), "focus_out_event",
+               G_CALLBACK(addressbook_address_index_focus_evt_out), NULL);
 
        clist_vbox = gtk_vbox_new(FALSE, 4);
 
@@ -839,8 +998,19 @@ 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);
+       gtk_widget_set_size_request(clist, -1, 80);
+
+       addressbook_sort_list(GTK_CLIST(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);
+       g_signal_connect(G_OBJECT(clist), "focus_in_event",
+               G_CALLBACK(addressbook_address_list_focus_evt_in), NULL);
+       g_signal_connect(G_OBJECT(clist), "focus_out_event",
+               G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
 
        for (i = 0; i < N_LIST_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
@@ -873,20 +1043,28 @@ static void addressbook_create(void)
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
-       address_completion_register_entry(GTK_ENTRY(entry));
+       address_completion_register_entry(GTK_ENTRY(entry), FALSE);
 
        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);
-       gtk_paned_add2(GTK_PANED(paned), clist_vbox);
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               editaddress_vbox = gtk_vbox_new(FALSE, 4);
+               vpaned = gtk_vpaned_new();
+               gtk_paned_pack1(GTK_PANED(vpaned), clist_vbox, FALSE, FALSE);
+               gtk_paned_pack2(GTK_PANED(vpaned), editaddress_vbox, TRUE, FALSE);
+       } else {
+               vpaned = NULL;
+               editaddress_vbox = NULL;
+       }
+       hpaned = gtk_hpaned_new();
+       gtk_box_pack_start(GTK_BOX(vbox2), hpaned, TRUE, TRUE, 0);
+       gtk_paned_pack1(GTK_PANED(hpaned), ctree_swin, FALSE, FALSE);
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               gtk_paned_pack2(GTK_PANED(hpaned), clist_vbox, TRUE, FALSE);
+       else
+               gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
 
        /* Status bar */
        hsbox = gtk_hbox_new(FALSE, 0);
@@ -897,15 +1075,13 @@ 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_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)
+       gtkut_stock_button_add_help(hbbox, &help_btn);
+
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-#else
-       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
-#endif
        GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
@@ -920,6 +1096,10 @@ static void addressbook_create(void)
        GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
+       g_signal_connect(G_OBJECT(help_btn), "clicked",
+                        G_CALLBACK(manual_open_with_anchor_cb),
+                        MANUAL_ANCHOR_ADDRBOOK);
+
        g_signal_connect(G_OBJECT(edit_btn), "clicked",
                         G_CALLBACK(addressbook_edit_clicked), NULL);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -967,6 +1147,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 ) {
@@ -1005,10 +1187,13 @@ static void addressbook_create(void)
                                       NULL);
 
        addrbook.window  = window;
+       addrbook.hpaned  = hpaned;
+       addrbook.vpaned  = vpaned;
        addrbook.menubar = menubar;
        addrbook.ctree   = ctree;
        addrbook.ctree_swin
                         = ctree_swin;
+       addrbook.editaddress_vbox = editaddress_vbox;
        addrbook.clist   = clist;
        addrbook.label   = label;
        addrbook.entry   = entry;
@@ -1016,6 +1201,7 @@ static void addressbook_create(void)
        addrbook.status_cid = gtk_statusbar_get_context_id(
                        GTK_STATUSBAR(statusbar), "Addressbook Window" );
 
+       addrbook.help_btn = help_btn;
        addrbook.edit_btn = edit_btn;
        addrbook.del_btn = del_btn;
        addrbook.reg_btn = reg_btn;
@@ -1031,7 +1217,6 @@ static void addressbook_create(void)
        addrbook.menu_factory = menu_factory;
 
        addrbook.listSelected = NULL;
-       address_completion_start(window);
 
        if (!geometry.min_height) {
                geometry.min_width = ADDRESSBOOK_WIDTH;
@@ -1043,6 +1228,15 @@ static void addressbook_create(void)
        gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
                                    prefs_common.addressbookwin_height);
 
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               gtk_paned_set_position(GTK_PANED(vpaned), prefs_common.addressbook_vpaned_pos);
+               g_signal_connect(G_OBJECT(vpaned), "notify::position",
+                               G_CALLBACK(addressbook_pane_notify_position), NULL);
+       }       
+       gtk_paned_set_position(GTK_PANED(hpaned), prefs_common.addressbook_hpaned_pos);
+       g_signal_connect(G_OBJECT(hpaned), "notify::position",
+                       G_CALLBACK(addressbook_pane_notify_position), NULL);
+
        gtk_widget_show_all(window);
 }
 
@@ -1050,6 +1244,9 @@ static void addressbook_create(void)
  * Close address book window and save to file(s).
  */
 static gint addressbook_close( void ) {
+       address_completion_end(addrbook.window);
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
        gtk_widget_hide(addrbook.window);
        addressbook_export_to_file();
        return TRUE;
@@ -1120,10 +1317,7 @@ static void addressbook_button_set_sensitive(void)
        if (addrbook.target_compose) {
                to_sens = TRUE;
                cc_sens = TRUE;
-#ifndef CLAWS          
-               if (addrbook.target_compose->use_bcc)
-#endif                 
-                       bcc_sens = TRUE;
+               bcc_sens = TRUE;
        }
 
        gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
@@ -1192,16 +1386,35 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        abf = ds->rawDataSource;
        if( abf == NULL ) return;
 
-       /* Confirm deletion */
-       aval = alertpanel( _("Delete address(es)"),
-                       _("Really delete the address(es)?"),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
-       if( aval != G_ALERTDEFAULT ) return;
 
        /* Process deletions */
        if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
+               gboolean group_delete = TRUE;
                /* Items inside folders */
                list = addrselect_get_list( _addressSelect_ );
+               /* Confirm deletion */
+               node = list;
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = ( AddrItemObject * ) item->addressItem;
+                       if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) {
+                               group_delete = FALSE;
+                               break;
+                       }
+               }
+               if (group_delete) {
+                       aval = alertpanel( _("Delete group"),
+                                       _("Really delete the group(s)?\n"
+                                         "The addresses it contains will not be lost."),
+                                       GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+                       if( aval != G_ALERTALTERNATE ) return;
+               } else {
+                       aval = alertpanel( _("Delete address(es)"),
+                                       _("Really delete the address(es)?"),
+                                       GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+                       if( aval != G_ALERTALTERNATE ) return;
+               }
 
                node = list;
                while( node ) {
@@ -1236,6 +1449,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
                                item = addrbook_person_remove_email( abf, person, item );
                                if( item ) {
+                                       addrcache_remove_email(abf->addressCache, item);
                                        addritem_free_item_email( item );
                                }
                                addressbook_folder_refresh_one_person( clist, person );
@@ -1368,30 +1582,41 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
        /* Select from address list */
        list = addrselect_get_list( _addressSelect_ );
        node = list;
-       while( node ) {
-               item = node->data;
-               node = g_list_next( node );
-               aio = item->addressItem;
-               if( aio->type == ADDR_ITEM_PERSON ||
-                   aio->type == ADDR_ITEM_EMAIL ) {
-                       addr = addressbook_format_address( aio );
-                       compose_entry_append(
-                               compose, addr, (ComposeEntryType) data );
-                       g_free( addr );
-               }
-               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 );
+       if (node) {
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = item->addressItem;
+                       if( aio->type == ADDR_ITEM_PERSON ||
+                           aio->type == ADDR_ITEM_EMAIL ) {
+                               addr = addressbook_format_address( aio );
+                               compose_entry_append(
+                                       compose, addr, (ComposeEntryType) data );
+                               g_free( addr );
+                       }
+                       else if( aio->type == ADDR_ITEM_GROUP ) {
+                               ItemGroup *group = ( ItemGroup * ) aio;
+                               GList *nodeMail = group->listEMail;
+                               while( nodeMail ) {
+                                       ItemEMail *email = nodeMail->data;
+
+                                       addr = addressbook_format_address(
+                                                       ( AddrItemObject * ) email );
+                                       compose_entry_append(
+                                               compose, addr, (ComposeEntryType) data );
+                                       g_free( addr );
+                                       nodeMail = g_list_next( nodeMail );
                                }
                        }
+               }
+       } else {
+               AddressObject *obj = NULL;
+
+               obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       
+               if( obj && obj->type == ADDR_ITEM_GROUP ) {
+                       ItemGroup *itemGroup = ADAPTER_GROUP(obj)->itemGroup;
+                       GList *nodeMail = itemGroup->listEMail;
                        while( nodeMail ) {
                                ItemEMail *email = nodeMail->data;
 
@@ -1576,6 +1801,8 @@ static void 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 */
@@ -1586,6 +1813,8 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        g_signal_handlers_unblock_by_func
                (G_OBJECT(ctree),
                 G_CALLBACK(addressbook_tree_selected), NULL);
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
 
        /* Setup main menu selections */
        addressbook_menubar_set_sensitive( FALSE );
@@ -1844,77 +2073,6 @@ static void addressbook_clip_paste_cb( void ) {
 
 }
 
-#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 );
-               addressbook_set_clist(
-                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
-                               addrbook.opened),
-                       TRUE);
-       }
-}
-#endif
-
 /**
  * Add current treenode object to clipboard. Note that widget only allows
  * one entry from the tree list to be selected.
@@ -2070,6 +2228,9 @@ static void addressbook_list_row_selected( GtkCTree *clist,
        }
 
        addressbook_list_menu_setup();
+
+       if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_address(NULL, 0, NULL, FALSE);
 }
 
 static void addressbook_list_row_unselected( GtkCTree *ctree,
@@ -2084,6 +2245,9 @@ static void addressbook_list_row_unselected( GtkCTree *ctree,
                /* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
                addressbook_list_select_remove( aio );
        }
+
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
 }
 
 /* from gdkevents.c */
@@ -2107,6 +2271,7 @@ static gboolean addressbook_list_button_pressed(GtkWidget *widget,
                            addrbook.target_compose)
                                addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
                        else
+                               if (prefs_common.addressbook_use_editaddress_dialog)
                                addressbook_edit_address_cb(NULL, 0, NULL);
 
                        lasttime = 0;
@@ -2143,6 +2308,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        gboolean canTreeCopy = FALSE;
        gboolean canTreePaste = FALSE;
        gboolean canLookup = FALSE;
+       GtkCTreeNode *node = NULL;
 
        if( ! event ) return FALSE;
        addressbook_menubar_set_sensitive( FALSE );
@@ -2155,11 +2321,27 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
 
        if( obj == NULL ) return FALSE;
+       node = gtk_ctree_node_nth(GTK_CTREE(clist), row);
 
        if( ! addrclip_is_empty( _clipBoard_ ) ) {
                canTreePaste = TRUE;
        }
 
+       if (obj->type == ADDR_INTERFACE) {
+               AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
+               iface = adapter->interface;
+               canEdit = FALSE;
+               canDelete = FALSE;
+               canTreeCopy = FALSE;
+               if( iface->readOnly ) {
+                       canTreePaste = FALSE;
+               }
+               else {
+                       menu_set_sensitive( addrbook.tree_factory, "/New Book", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+               }
+               if( iface->externalQuery ) canLookup = TRUE;
+       }
        if (obj->type == ADDR_DATASOURCE) {
                ads = ADAPTER_DSOURCE(obj);
                ds = ads->dataSource;
@@ -2175,15 +2357,17 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                }
                else {
                        menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
                canTreeCopy = TRUE;
                if( iface->externalQuery ) canLookup = TRUE;
        }
        else if (obj->type == ADDR_ITEM_FOLDER) {
-               ds = addressbook_find_datasource( addrbook.treeSelected );
-               if (!ds)
+               ds = addressbook_find_datasource( node );
+               if (!ds) {
                        goto just_set_sens;
+               }
                iface = ds->interface;
                if (!iface)
                        goto just_set_sens;
@@ -2195,6 +2379,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                        canDelete = TRUE;
                        canTreeCut = TRUE;
                        menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
                canTreeCopy = TRUE;
@@ -2206,7 +2391,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                }
        }
        else if (obj->type == ADDR_ITEM_GROUP) {
-               ds = addressbook_find_datasource( addrbook.treeSelected );
+               ds = addressbook_find_datasource( node );
                if (!ds)
                        goto just_set_sens;
                iface = ds->interface;
@@ -2528,34 +2713,42 @@ 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);
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               message = g_strdup_printf(_("Do you want to delete '%s'?\n"
+                                           "The addresses it contains will not be lost."), obj->name);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL, 
+                               "+" GTK_STOCK_DELETE, NULL);
+               g_free(message);
+               if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_FOLDER_ONLY;
+       } else {
+               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;
 
@@ -2633,6 +2826,28 @@ static void addressbook_treenode_delete_cb(
        }
 }
 
+void addressbook_new_address_from_book_post_cb( ItemPerson *person )
+{
+       if( person && addrbook.treeSelected == addrbook.opened ) {
+               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+               addressbook_folder_refresh_one_person(
+                       GTK_CTREE(addrbook.clist), person );
+       }
+       addressbook_address_list_set_focus();
+}
+
+void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
+{
+       if( person && 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);
+       }
+       addressbook_address_list_set_focus();
+}
+
 static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
        AddressObject *pobj = NULL;
        AddressDataSource *ds = NULL;
@@ -2649,27 +2864,23 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
        if( pobj->type == ADDR_DATASOURCE ) {
                if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
                        /* New address */
-                       ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
-                       if( person && addrbook.treeSelected == addrbook.opened ) {
-                               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
-                               addressbook_folder_refresh_one_person(
-                                       GTK_CTREE(addrbook.clist), person );
-                       }
+                       ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE,
+                                                                                                                 addrbook.editaddress_vbox,
+                                                                                                                 addressbook_new_address_from_book_post_cb,
+                                                                                                                 TRUE );
+                       if (prefs_common.addressbook_use_editaddress_dialog)
+                               addressbook_new_address_from_book_post_cb( person );
                }
        }
        else if( pobj->type == ADDR_ITEM_FOLDER ) {
                /* New address */
                ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
-               ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
-               if( person ) {
-                       if (addrbook.treeSelected == addrbook.opened) {
-                               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
-                               addressbook_set_clist(
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
-                                               addrbook.opened),
-                                       TRUE);
-                       }
-               }
+               ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE,
+                                                                                                         addrbook.editaddress_vbox,
+                                                                                                         addressbook_new_address_from_folder_post_cb,
+                                                                                                         TRUE );
+               if (prefs_common.addressbook_use_editaddress_dialog)
+                       addressbook_new_address_from_folder_post_cb( person );
        }
        else if( pobj->type == ADDR_ITEM_GROUP ) {
                /* New address in group */
@@ -2750,7 +2961,29 @@ static void addressbook_move_nodes_up( GtkCTree *ctree, GtkCTreeNode *node ) {
        }
 }
 
+void addressbook_edit_address_post_cb( ItemPerson *person )
+{
+       if( person ) {
+               addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
+               invalidate_address_completion();
+       }
+       addressbook_address_list_set_focus();
+}
+
+void addressbook_address_list_set_focus( void )
+{
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               gtk_window_set_focus(GTK_WINDOW(addrbook.window), addrbook.clist);
+fprintf(stderr, "addressbook_address_list_set_focus: %p\n", addrbook.listSelected );
+       }
+}
+
 static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+       addressbook_edit_address(data, action, widget, TRUE);
+}
+       
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+                                                                         gboolean force_focus ) {
        GtkCTree *clist = GTK_CTREE(addrbook.clist);
        GtkCTree *ctree;
        AddressObject *obj = NULL, *pobj = NULL;
@@ -2789,18 +3022,26 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                        /* Edit person - email page */
                        ItemPerson *person;
                        person = ( ItemPerson * ) ADDRITEM_PARENT(email);
-                       if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
-                       addressbook_folder_refresh_one_person( clist, person );
-                       invalidate_address_completion();
+                       if  ( addressbook_edit_person( abf, NULL, person, TRUE, addrbook.editaddress_vbox,
+                                                                                  addressbook_edit_address_post_cb,
+                                                                                  (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+                                 != NULL ) {
+                               if (prefs_common.addressbook_use_editaddress_dialog)
+                                       addressbook_edit_address_post_cb( person );
+                       }
                        return;
                }
        }
        else if( obj->type == ADDR_ITEM_PERSON ) {
                /* Edit person - basic page */
                ItemPerson *person = ( ItemPerson * ) obj;
-               if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
-               invalidate_address_completion();
-               addressbook_folder_refresh_one_person( clist, person );
+               if( addressbook_edit_person( abf, NULL, person, FALSE, addrbook.editaddress_vbox,
+                                                                         addressbook_edit_address_post_cb,
+                                                                         (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+                       != NULL ) {
+                       if (prefs_common.addressbook_use_editaddress_dialog)
+                               addressbook_edit_address_post_cb( person );
+               }
                return;
        }
        else if( obj->type == ADDR_ITEM_GROUP ) {
@@ -2809,6 +3050,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                parentNode = addrbook.treeSelected;
                node = addressbook_find_group_node( parentNode, itemGrp );
                name = ADDRITEM_NAME(itemGrp);
+               invalidate_address_completion();
        }
        else {
                return;
@@ -2917,7 +3159,7 @@ static void addressbook_folder_load_one_person(
 
        if( person == NULL ) return;
 
-       text[COL_NAME] = NULL;
+       text[COL_NAME] = "";
        node = person->listEMail;
        while( node ) {
                ItemEMail *email = node->data;
@@ -2964,8 +3206,8 @@ static void addressbook_folder_load_one_person(
        if( ! haveAddr ) {
                /* Have name without EMail */
                text[COL_NAME] = ADDRITEM_NAME(person);
-               text[COL_ADDRESS] = NULL;
-               text[COL_REMARKS] = NULL;
+               text[COL_ADDRESS] = "";
+               text[COL_REMARKS] = "";
                nodePerson = gtk_sctree_insert_node(
                                clist, NULL, NULL,
                                text, FOLDER_SPACING,
@@ -3052,8 +3294,8 @@ static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFold
                ItemGroup *group = items->data;
                if( group == NULL ) continue;
                text[COL_NAME] = ADDRITEM_NAME(group);
-               text[COL_ADDRESS] = NULL;
-               text[COL_REMARKS] = NULL;
+               text[COL_ADDRESS] = "";
+               text[COL_REMARKS] = "";
                nodeGroup = gtk_sctree_insert_node(clist, NULL, NULL,
                                      text, FOLDER_SPACING,
                                      atci->iconXpm, atci->maskXpm,
@@ -3193,6 +3435,9 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
        AdapterDSource *ads = NULL;
        static AddressObject *last_obj = NULL;
 
+       if (addrbook.clist == NULL) {
+               return;
+       }
        if (obj == last_obj && !refresh)
                return;
 
@@ -3237,7 +3482,8 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
                        addressbook_folder_load_group( ctreelist, itemFolder );
                }
        }
-       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+       gtk_sctree_sort_recursive(GTK_CTREE(clist), NULL);
+       clist->focus_row = -1;
        gtk_clist_thaw(clist);
 }
 
@@ -3377,7 +3623,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 {
@@ -3396,7 +3642,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 {
@@ -3657,38 +3903,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;
@@ -3841,7 +4055,7 @@ void addressbook_clear_idler( gint queryID ) {
        /* printf( "addressbook_clear_idler::%d::\n", queryID ); */
        ptrQID = GINT_TO_POINTER( queryID );
        if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
+               g_idle_remove_by_data( ptrQID );
        }
 }
 
@@ -3864,7 +4078,7 @@ static void addressbook_search_callback_end(
        /* Remove idler function */
        ptrQID = GINT_TO_POINTER( queryID );
        if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
+               g_idle_remove_by_data( ptrQID );
        }
 
        /* Refresh addressbook contents */
@@ -3943,7 +4157,7 @@ static void addressbook_perform_search(
        if( queryID == 0 ) return;
 
        /* Set up idler function */
-       idleID = gtk_idle_add(
+       idleID = g_idle_add(
                        ( GtkFunction ) addressbook_search_idle,
                        GINT_TO_POINTER( queryID ) );
 
@@ -4251,7 +4465,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        atci->showInTree = TRUE;
        atci->treeExpand = TRUE;
        atci->treeLeaf = FALSE;
-       atci->displayName = _( "LDAP Server" );
+       atci->displayName = _( "LDAP servers" );
        atci->iconXpm = ldapxpm;
        atci->maskXpm = ldapxpmmask;
        atci->iconXpmOpen = ldapxpm;
@@ -4372,18 +4586,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.
@@ -4466,6 +4668,198 @@ gboolean addressbook_add_contact(
        return TRUE;
 }
 
+/* ***********************************************************************
+ * Book/folder selection.
+ * ***********************************************************************
+ */
+
+/*
+ * This function is used by the matcher dialog to select a book/folder.
+ */
+gboolean addressbook_folder_selection( gchar **folderpath )
+{
+       AddressBookFile *book = NULL;
+       ItemFolder *folder = NULL;
+       gchar *path;
+
+       g_return_val_if_fail( folderpath != NULL, FALSE);
+
+       path = *folderpath;
+       *folderpath = NULL;
+       if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, path )
+               && book != NULL ) {
+               if ( folder != NULL) {
+                       gchar *tmp = NULL;
+                       gchar *oldtmp = NULL;
+                       AddrItemObject *obj = NULL;
+
+                       /* walk thru folder->parent to build the full folder path */
+                       /* TODO: wwp: optimize this */
+                       obj = &folder->obj;
+                       tmp = g_strdup(obj->uid);
+                       while ( obj->parent ) {
+                               obj = obj->parent;
+                               if ( obj->name != NULL ) {
+                                       oldtmp = g_strdup(tmp);
+                                       g_free(tmp);
+                                       tmp = g_strdup_printf("%s/%s", obj->uid, oldtmp);
+                                       g_free(oldtmp);
+                               }
+                       }
+                       *folderpath = g_strdup_printf("%s/%s", book->fileName, tmp);
+                       g_free(tmp);
+               } else {
+                       *folderpath = g_strdup_printf("%s", book->fileName);
+               }
+               debug_print( "addressbook_foldersel: %s\n", *folderpath);
+               return (*folderpath != NULL);
+       }
+       return FALSE;
+}
+
+/* ***********************************************************************
+ * Book/folder checking.
+ * ***********************************************************************
+ */
+
+static FolderInfo *addressbook_peek_subfolder_exists_create_folderinfo( AddressBookFile *abf, ItemFolder *folder )
+{
+       FolderInfo *fi = g_new0( FolderInfo, 1 );
+       fi->book   = abf;
+       fi->folder = folder;
+       return fi;
+}
+
+static void addressbook_peek_subfolder_exists_load_folder( ItemFolder *parentFolder,
+                                       FolderInfo *fiParent, FolderPathMatch *match )
+{
+       GList *list;
+       ItemFolder *folder;
+       gchar *fName;
+       FolderInfo *fi;
+       FolderPathMatch *nextmatch = NULL;
+
+       list = parentFolder->listFolder;
+       while ( list ) {
+               folder = list->data;
+               fName = g_strdup( ADDRITEM_NAME(folder) );
+
+               /* match folder name, match pointer will be set to NULL if next recursive call
+                  doesn't need to match subfolder name */
+               if ( match != NULL &&
+                        match->matched == FALSE ) {
+                       if ( strcmp(match->folder_path[match->index], folder->obj.uid) == 0 ) {
+                               /* folder name matches, prepare next subfolder match */
+                               debug_print("matched folder name '%s'\n", fName);
+                               match->index++;
+                               if ( match->folder_path[match->index] == NULL ) {
+                                       /* we've matched all elements */
+                                       match->matched = TRUE;
+                                       match->folder = folder;
+                                       debug_print("book/folder path matched!\n");
+                               } else {
+                                       /* keep on matching */
+                                       nextmatch = match;
+                               }
+                       }
+               }
+
+               g_free( fName );
+
+               fi = addressbook_peek_subfolder_exists_create_folderinfo( fiParent->book, folder );
+               addressbook_peek_subfolder_exists_load_folder( folder, fi, nextmatch );
+               list = g_list_next( list );
+       }
+}
+
+/*
+ * This function is used by to check if a matcher book/folder path corresponds to an
+   existing addressbook book/folder ("" or "Any" are considered as valid, NULL invalid).
+ */
+
+gboolean addressbook_peek_folder_exists( gchar *folderpath,
+                                                                                AddressDataSource **book,
+                                                                                ItemFolder **folder )
+{
+       AddressDataSource *ds;
+       GList *list, *nodeDS;
+       ItemFolder *rootFolder;
+       AddressBookFile *abf;
+       FolderInfo *fi;
+       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL, NULL };
+       FolderPathMatch *nextmatch;
+
+       if ( book )
+               *book = NULL;
+       if ( folder )
+               *folder = NULL;
+
+       if ( folderpath == NULL )
+               return FALSE;
+
+       if ( strcasecmp(folderpath, _("Any")) == 0 || *folderpath == '\0' )
+               return TRUE;
+
+       /* split the folder path we've received, we'll try to match this path, subpath by
+          subpath against the book/folder structure in order */
+       folder_path_match.folder_path = g_strsplit( folderpath, "/", 256 );
+
+       list = addrindex_get_interface_list( _addressIndex_ );
+       while ( list ) {
+               AddressInterface *interface = list->data;
+               if ( interface->type == ADDR_IF_BOOK ) {
+                       nodeDS = interface->listSource;
+                       while ( nodeDS ) {
+                               ds = nodeDS->data;
+
+                               /* Read address book */
+                               if( ! addrindex_ds_get_read_flag( ds ) ) {
+                                       addrindex_ds_read_data( ds );
+                               }
+
+                               /* Add node for address book */
+                               abf = ds->rawDataSource;
+
+                               /* try to match subfolders if this book is the right book
+                                       (and if there's smth to match, and not yet matched) */
+                               nextmatch = NULL;
+                               if ( folder_path_match.folder_path != NULL &&
+                                        folder_path_match.matched == FALSE &&
+                                        strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
+                                       debug_print("matched book name '%s'\n", abf->fileName);
+                                       folder_path_match.index = 1;
+                                       if ( folder_path_match.folder_path[folder_path_match.index] == NULL ) {
+                                               /* we've matched all elements */
+                                               folder_path_match.matched = TRUE;
+                                               folder_path_match.book = ds;
+                                               debug_print("book path matched!\n");
+                                       } else {
+                                               /* keep on matching */
+                                               nextmatch = &folder_path_match;
+                                       }
+                               }
+
+                               fi = addressbook_peek_subfolder_exists_create_folderinfo( abf, NULL );
+
+                               rootFolder = addrindex_ds_get_root_folder( ds );
+                               addressbook_peek_subfolder_exists_load_folder( rootFolder, fi, nextmatch );
+
+                               nodeDS = g_list_next( nodeDS );
+                       }
+               }
+               list = g_list_next( list );
+       }
+
+       g_strfreev( folder_path_match.folder_path );
+
+       if ( book )
+               *book = folder_path_match.book;
+       if ( folder )
+               *folder = folder_path_match.folder;
+       return folder_path_match.matched;
+}
+
+
 /* **********************************************************************
  * Address Import.
  * ***********************************************************************