revert commit 0.8.10claws54 - breaks editing of address book
[claws.git] / src / addressbook.c
index ab55463821872dc3d5ee449c7724103e69f2578f..3f0189ea725de15cd47e527ead841e7e2be3a69b 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@
 #include "menu.h"
 #include "stock_pixmap.h"
 #include "xml.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "procmime.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -301,6 +301,16 @@ static gint addressbook_treenode_compare_func      (GtkCList       *clist,
 static gint addressbook_list_compare_func      (GtkCList       *clist,
                                                 gconstpointer   ptr1,
                                                 gconstpointer   ptr2);
+static void addressbook_folder_load_one_person (GtkCTree *clist, 
+                                                ItemPerson *person,  
+                                                AddressTypeControlItem *atci, 
+                                                AddressTypeControlItem *atciMail);
+static void addressbook_folder_refresh_one_person(GtkCTree *clist, 
+                                                 ItemPerson *person);
+static void addressbook_folder_remove_one_person(GtkCTree *clist, 
+                                                ItemPerson *person);
+static void addressbook_folder_remove_node     (GtkCTree *clist, 
+                                                GtkCTreeNode *node);
 
 #ifdef USE_LDAP
 static void addressbook_ldap_show_message      (SyldapServer *server);
@@ -408,6 +418,79 @@ static GtkItemFactoryEntry addressbook_list_popup_entries[] =
        {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb,     0, NULL}
 };
 
+/**
+ * Structure of error message table.
+ */
+typedef struct _ErrMsgTableEntry ErrMsgTableEntry;
+struct _ErrMsgTableEntry {
+       gint    code;
+       gchar   *description;
+};
+
+static gchar *_errMsgUnknown_ = N_( "Unknown" );
+
+/**
+ * Lookup table of error messages for general errors. Note that a NULL
+ * description signifies the end of the table.
+ */
+static ErrMsgTableEntry _lutErrorsGeneral_[] = {
+       { MGU_SUCCESS,          N_("Success") },
+       { MGU_BAD_ARGS,         N_("Bad arguments") },
+       { MGU_NO_FILE,          N_("File not specified") },
+       { MGU_OPEN_FILE,        N_("Error opening file") },
+       { MGU_ERROR_READ,       N_("Error reading file") },
+       { MGU_EOF,              N_("End of file encountered") },
+       { MGU_OO_MEMORY,        N_("Error allocating memory") },
+       { MGU_BAD_FORMAT,       N_("Bad file format") },
+       { MGU_ERROR_WRITE,      N_("Error writing to file") },
+       { MGU_OPEN_DIRECTORY,   N_("Error opening directory") },
+       { MGU_NO_PATH,          N_("No path specified") },
+       { 0,                    NULL }
+};
+
+#ifdef USE_LDAP
+/**
+ * Lookup table of error messages for LDAP errors.
+ */
+static ErrMsgTableEntry _lutErrorsLDAP_[] = {
+       { MGU_SUCCESS,          N_("Success") },
+       { MGU_LDAP_CONNECT,     N_("Error connecting to LDAP server") },
+       { MGU_LDAP_INIT,        N_("Error initializing LDAP") },
+       { MGU_LDAP_BIND,        N_("Error binding to LDAP server") },
+       { MGU_LDAP_SEARCH,      N_("Error searching LDAP database") },
+       { MGU_LDAP_TIMEOUT,     N_("Timeout performing LDAP operation") },
+       { MGU_LDAP_CRITERIA,    N_("Error in LDAP search criteria") },
+       { MGU_LDAP_CRITERIA,    N_("Error in LDAP search criteria") },
+       { MGU_LDAP_NOENTRIES,   N_("No LDAP entries found for search criteria") },
+       { 0,                    NULL }
+};
+#endif
+
+/**
+ * Lookup message for specified error code.
+ * \param lut  Lookup table.
+ * \param code Code to lookup.
+ * \return Description associated to code.
+ */
+static gchar *addressbook_err2string( ErrMsgTableEntry lut[], gint code ) {
+        gchar *desc = NULL;
+        ErrMsgTableEntry entry;
+        gint i;
+
+        for( i = 0; ; i++ ) {
+                entry = lut[ i ];
+                if( entry.description == NULL ) break;
+                if( entry.code == code ) {
+                        desc = entry.description;
+                        break;
+                }
+        }
+        if( ! desc ) {
+               desc = _errMsgUnknown_;
+        }
+        return desc;
+}
+
 void addressbook_open(Compose *target)
 {
        /* Initialize all static members */
@@ -816,6 +899,7 @@ static void addressbook_ds_status_message( AddressDataSource *ds, gchar *msg ) {
 static void addressbook_ds_show_message( AddressDataSource *ds ) {
        gint retVal;
        gchar *name;
+       gchar *desc;
        *addressbook_msgbuf = '\0';
        if( ds ) {
                name = addrindex_ds_get_name( ds );
@@ -825,9 +909,9 @@ static void addressbook_ds_show_message( AddressDataSource *ds ) {
                                    sizeof(addressbook_msgbuf), "%s", name );
                }
                else {
+                       desc = addressbook_err2string( _lutErrorsGeneral_, retVal );
                        g_snprintf( addressbook_msgbuf, 
-                                   sizeof(addressbook_msgbuf), "%s: %s", name,
-                                   mgu_error2string( retVal ) );
+                           sizeof(addressbook_msgbuf), "%s: %s", name, desc );
                }
        }
        addressbook_status_show( addressbook_msgbuf );
@@ -873,7 +957,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        AddrItemObject *aio;
        AddrSelectItem *item;
        GList *list, *node;
-
+       gboolean refreshList = FALSE;
+       
        pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
        g_return_if_fail(pobj != NULL);
 
@@ -935,9 +1020,11 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                }
                                /* Remove group from parent node */
                                gtk_ctree_remove_node( ctree, nd );
+                               refreshList = TRUE;
                        }
                        else if( aio->type == ADDR_ITEM_PERSON ) {
                                ItemPerson *item = ( ItemPerson * ) aio;
+                               addressbook_folder_remove_one_person( clist, item );
                                item = addrbook_remove_person( abf, item );
                                if( item ) {
                                        addritem_free_item_person( item );
@@ -950,11 +1037,12 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                if( item ) {
                                        addritem_free_item_email( item );
                                }
+                               addressbook_folder_refresh_one_person( clist, person );
                        }
                }
                g_list_free( list );
                addressbook_list_select_clear();
-               gtk_ctree_select( ctree, addrbook.opened);
+               if( refreshList ) gtk_ctree_select( ctree, addrbook.opened);
                return;
        }
        else if( pobj->type == ADDR_ITEM_GROUP ) {
@@ -2158,10 +2246,9 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
                        /* New address */
                        ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
-                       if( person ) {
-                               if( addrbook.treeSelected == addrbook.opened ) {
-                                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
-                               }
+                       if( person && addrbook.treeSelected == addrbook.opened ) {
+                               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+                               addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
                        }
                }
        }
@@ -2289,7 +2376,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                        ItemPerson *person;
                        person = ( ItemPerson * ) ADDRITEM_PARENT(email);
                        if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
-                       gtk_ctree_select( ctree, addrbook.opened );
+                       addressbook_folder_refresh_one_person( clist, person );
                        invalidate_address_completion();
                        return;
                }
@@ -2298,8 +2385,8 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                /* Edit person - basic page */
                ItemPerson *person = ( ItemPerson * ) obj;
                if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
-               gtk_ctree_select( ctree, addrbook.opened);
                invalidate_address_completion();
+               addressbook_folder_refresh_one_person( clist, person );
                return;
        }
        else if( obj->type == ADDR_ITEM_GROUP ) {
@@ -2317,7 +2404,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
        if( node == NULL ) return;
        addressbook_change_node_name( node, name );
        gtk_sctree_sort_node( ctree, parentNode );
-       gtk_ctree_select( ctree, addrbook.opened );
+       gtk_ctree_select( ctree, addrbook.opened ); 
 }
 
 static void addressbook_delete_address_cb(gpointer data, guint action,
@@ -2397,91 +2484,137 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
        }
 }
 
-static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
-       GList *items;
-       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
-       AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
-
-       if( atci == NULL ) return;
-       if( atciMail == NULL ) return;
-
-       /* Load email addresses */
-       items = addritem_folder_get_person_list( itemFolder );
-       for( ; items != NULL; items = g_list_next( items ) ) {
-               GtkCTreeNode *nodePerson = NULL;
-               GtkCTreeNode *nodeEMail = NULL;
-               gchar *text[N_COLS];
-               gboolean flgFirst = TRUE, haveAddr = FALSE;
-               ItemPerson *person;
-               GList *node;
+static void addressbook_folder_load_one_person( GtkCTree *clist, ItemPerson *person,  
+                                               AddressTypeControlItem *atci, AddressTypeControlItem *atciMail) {
+       
+       GtkCTreeNode *nodePerson = NULL;
+       GtkCTreeNode *nodeEMail = NULL;
+       gchar *text[N_COLS];
+       gboolean flgFirst = TRUE, haveAddr = FALSE;
+       GList *node;
 
-               person = ( ItemPerson * ) items->data;
-               if( person == NULL ) continue;
+       if( person == NULL ) return;
 
-               text[COL_NAME] = NULL;
-               node = person->listEMail;
-               while( node ) {
-                       ItemEMail *email = node->data;
-                       gchar *eMailAddr = NULL;
-                       node = g_list_next( node );
+       text[COL_NAME] = NULL;
+       node = person->listEMail;
+       while( node ) {
+               ItemEMail *email = node->data;
+               gchar *eMailAddr = NULL;
+               node = g_list_next( node );
 
-                       text[COL_ADDRESS] = email->address;
-                       text[COL_REMARKS] = email->remarks;
-                       eMailAddr = ADDRITEM_NAME(email);
-                       if( eMailAddr && *eMailAddr == '\0' ) eMailAddr = NULL;
-                       if( flgFirst ) {
-                               /* First email belongs with person */
-                               gchar *str = addressbook_format_item_clist( person, email );
-                               if( str ) {
-                                       text[COL_NAME] = str;
-                               }
-                               else {
-                                       text[COL_NAME] = ADDRITEM_NAME(person);
-                               }
-                               nodePerson = gtk_ctree_insert_node(
-                                               clist, NULL, NULL,
-                                               text, FOLDER_SPACING,
-                                               atci->iconXpm, atci->maskXpm,
-                                               atci->iconXpmOpen, atci->maskXpmOpen,
-                                               FALSE, person->isOpened );
-                               g_free( str );
-                               str = NULL;
-                               gtk_ctree_node_set_row_data(clist, nodePerson, person );
+               text[COL_ADDRESS] = email->address;
+               text[COL_REMARKS] = email->remarks;
+               eMailAddr = ADDRITEM_NAME(email);
+               if( eMailAddr && *eMailAddr == '\0' ) eMailAddr = NULL;
+               if( flgFirst ) {
+                       /* First email belongs with person */
+                       gchar *str = addressbook_format_item_clist( person, email );
+                       if( str ) {
+                               text[COL_NAME] = str;
                        }
                        else {
-                               /* Subsequent email is a child node of person */
-                               text[COL_NAME] = ADDRITEM_NAME(email);
-                               nodeEMail = gtk_ctree_insert_node(
-                                               clist, nodePerson, NULL,
-                                               text, FOLDER_SPACING,
-                                               atciMail->iconXpm, atciMail->maskXpm,
-                                               atciMail->iconXpmOpen, atciMail->maskXpmOpen,
-                                               FALSE, TRUE );
-                               gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+                               text[COL_NAME] = ADDRITEM_NAME(person);
                        }
-                       flgFirst = FALSE;
-                       haveAddr = TRUE;
-               }
-               if( ! haveAddr ) {
-                       /* Have name without EMail */
-                       text[COL_NAME] = ADDRITEM_NAME(person);
-                       text[COL_ADDRESS] = NULL;
-                       text[COL_REMARKS] = NULL;
                        nodePerson = gtk_ctree_insert_node(
                                        clist, NULL, NULL,
                                        text, FOLDER_SPACING,
                                        atci->iconXpm, atci->maskXpm,
                                        atci->iconXpmOpen, atci->maskXpmOpen,
                                        FALSE, person->isOpened );
+                       g_free( str );
+                       str = NULL;
                        gtk_ctree_node_set_row_data(clist, nodePerson, person );
                }
-               gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+               else {
+                       /* Subsequent email is a child node of person */
+                       text[COL_NAME] = ADDRITEM_NAME(email);
+                       nodeEMail = gtk_ctree_insert_node(
+                                       clist, nodePerson, NULL,
+                                       text, FOLDER_SPACING,
+                                       atciMail->iconXpm, atciMail->maskXpm,
+                                       atciMail->iconXpmOpen, atciMail->maskXpmOpen,
+                                       FALSE, TRUE );
+                       gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+               }
+               flgFirst = FALSE;
+               haveAddr = TRUE;
+       }
+       if( ! haveAddr ) {
+               /* Have name without EMail */
+               text[COL_NAME] = ADDRITEM_NAME(person);
+               text[COL_ADDRESS] = NULL;
+               text[COL_REMARKS] = NULL;
+               nodePerson = gtk_ctree_insert_node(
+                               clist, NULL, NULL,
+                               text, FOLDER_SPACING,
+                               atci->iconXpm, atci->maskXpm,
+                               atci->iconXpmOpen, atci->maskXpmOpen,
+                               FALSE, person->isOpened );
+               gtk_ctree_node_set_row_data(clist, nodePerson, person );
+       }
+       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+       return;
+}
+
+static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
+       GList *items;
+       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+       AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+
+       if( atci == NULL ) return;
+       if( atciMail == NULL ) return;
+
+       /* Load email addresses */
+       items = addritem_folder_get_person_list( itemFolder );
+       for( ; items != NULL; items = g_list_next( items ) ) {
+               addressbook_folder_load_one_person( clist, items->data, atci, atciMail );
        }
        /* Free up the list */
        mgu_clear_list( items );
        g_list_free( items );
 }
 
+static void addressbook_folder_remove_node( GtkCTree *clist, GtkCTreeNode *node ) { 
+       addrbook.listSelected = NULL;
+       gtk_ctree_remove_node( clist, node );
+       addressbook_menubar_set_sensitive( FALSE );
+       addressbook_menuitem_set_sensitive( gtk_ctree_node_get_row_data( 
+                                               GTK_CTREE(clist), addrbook.treeSelected ), addrbook.treeSelected );
+}
+
+static void addressbook_folder_refresh_one_person( GtkCTree *clist, ItemPerson *person ) {
+       AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+       AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+       GtkCTreeNode *node;
+       if( atci == NULL ) return;
+       if( atciMail == NULL ) return;
+       if( person == NULL ) return;
+       /* unload the person */
+       
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       if( node )
+               addressbook_folder_remove_node( clist, node );
+       addressbook_folder_load_one_person( clist, person, atci, atciMail );
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       if( node ) {
+               gtk_ctree_select( clist, node );
+               if (!gtk_ctree_node_is_visible( clist, node ) ) 
+                       gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
+       }
+}
+
+static void addressbook_folder_remove_one_person( GtkCTree *clist, ItemPerson *person ) {
+       GtkCTreeNode *node;
+       gint row;
+       
+       if( person == NULL ) return;
+       node = gtk_ctree_find_by_row_data( clist, NULL, person );
+       row  = gtk_clist_find_row_from_data( GTK_CLIST(clist), person );
+       if( node ) {
+               addressbook_folder_remove_node( clist, node );
+       }
+}
+
 static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFolder ) {
        GList *items;
        AddressTypeControlItem *atci =  addrbookctl_lookup( ADDR_ITEM_GROUP );
@@ -3182,6 +3315,7 @@ static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *wid
 
 static void addressbook_ldap_show_message( SyldapServer *svr ) {
        gchar *name;
+       gchar *desc;
        *addressbook_msgbuf = '\0';
        if( svr ) {
                name = syldap_get_name( svr );
@@ -3197,17 +3331,18 @@ static void addressbook_ldap_show_message( SyldapServer *svr ) {
                                            name );
                        }
                        else {
+                               desc = addressbook_err2string(
+                                               _lutErrorsLDAP_, svr->retVal );
                                g_snprintf( addressbook_msgbuf,
                                            sizeof(addressbook_msgbuf),
-                                           "%s: %s", name,
-                                           mgu_error2string( svr->retVal ) );
+                                           "%s: %s", name, desc );
                        }
                }
        }
        addressbook_status_show( addressbook_msgbuf );
 }
 
-static void ldapsearch_callback( SyldapServer *sls ) {
+static void addressbook_ldap_show_results( SyldapServer *sls ) {
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
        AddressObject *obj;
        AdapterDSource *ads = NULL;
@@ -3241,6 +3376,52 @@ static void ldapsearch_callback( SyldapServer *sls ) {
                }
        }
 }
+
+/*
+ * LDAP idle function. This function is called during UI idle time while
+ * an LDAP search is in progress.
+ * Enter: data Reference to LDAP server object.
+ */
+static void addressbook_ldap_idle( gpointer data ) {
+       SyldapServer *server;
+
+       server = ( SyldapServer * ) data;       
+       if( ! server->busyFlag ) {
+               /* Server has completed search - remove from idle list */
+               gtk_idle_remove( server->idleId );
+
+               /* Process callback and free up the thread */
+               addressbook_ldap_show_results( server );
+               g_free( server->thread );
+               server->thread = NULL;
+       }
+}
+
+/*
+ * Perform lookup for LDAP search.
+ * Enter: ads     Adapter for data source.
+ *        sLookup Lookup string.
+ */
+static void addressbook_ldap_lookup( AdapterDSource *ads, gchar *sLookup ) {
+       AddressDataSource *ds = NULL;
+       AddressInterface *iface = NULL;
+       SyldapServer *server;
+
+       ds = ads->dataSource;
+       if( ds == NULL ) return;
+       iface = ds->interface;
+       if( ! iface->haveLibrary ) return;
+       server = ds->rawDataSource;
+       if( server ) {
+               syldap_cancel_read( server );
+               if( *sLookup == '\0' || strlen( sLookup ) < 1 ) return;
+               syldap_set_search_value( server, sLookup );
+               server->idleId = gtk_idle_add(
+                       ( GtkFunction ) addressbook_ldap_idle, server );
+               syldap_read_data_th( server );
+               addressbook_ldap_show_message( server );
+       }
+}
 #endif
 
 /*
@@ -3250,10 +3431,6 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
        GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
        AddressObject *obj;
        AdapterDSource *ads = NULL;
-#ifdef USE_LDAP
-       AddressDataSource *ds = NULL;
-       AddressInterface *iface = NULL;
-#endif /* USE_LDAP */
        gchar *sLookup;
 
        if( ! addrbook.treeSelected ) return;
@@ -3269,21 +3446,7 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
                ads = ADAPTER_DSOURCE(obj);
 #ifdef USE_LDAP
                if( ads->subType == ADDR_LDAP ) {
-                       SyldapServer *server;
-
-                       ds = ads->dataSource;
-                       if( ds == NULL ) return;
-                       iface = ds->interface;
-                       if( ! iface->haveLibrary ) return;
-                       server = ds->rawDataSource;
-                       if( server ) {
-                               syldap_cancel_read( server );
-                               if( *sLookup == '\0' || strlen( sLookup ) < 1 ) return;
-                               syldap_set_search_value( server, sLookup );
-                               syldap_set_callback( server, ldapsearch_callback );
-                               syldap_read_data_th( server );
-                               addressbook_ldap_show_message( server );
-                       }
+                       addressbook_ldap_lookup( ads, sLookup );
                }
 #endif /* USE_LDAP */
        }