#include "codeconv.h"
#include "about.h"
#include "addr_compl.h"
+#include "password.h"
#include "mgutils.h"
#include "addressitem.h"
GList *node,
gpointer *data );
+static void addressbook_entry_activated (GtkWidget *widget,
+ gpointer data);
+
static gboolean addressbook_list_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
{ LDAPRC_CRITERIA, N_("Error in LDAP search criteria") },
{ LDAPRC_NOENTRIES, N_("No LDAP entries found for search criteria") },
{ LDAPRC_STOP_FLAG, N_("LDAP search terminated on request") },
- { LDAPRC_TLS, N_("Error starting TLS connection") },
+ { LDAPRC_TLS, N_("Error starting STARTTLS connection") },
{ LDAPRC_NODN, N_("Distinguished Name (dn) is missing") },
{ LDAPRC_NAMING_VIOLATION, N_("Missing required information") },
{ LDAPRC_ALREADY_EXIST, N_("Another contact exists with that key") },
}
if( _clipBoard_ != NULL ) {
addrclip_free( _clipBoard_ );
+ _clipBoard_ = NULL;
}
if( _addressIndex_ != NULL ) {
addrindex_free_index( _addressIndex_ );
hbox = gtk_hbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("Lookup name:"));
+ label = gtk_label_new(_("Search"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new();
g_signal_connect(G_OBJECT(entry), "key_press_event",
G_CALLBACK(addressbook_entry_key_pressed),
NULL);
+ g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(addressbook_entry_activated), NULL);
if (!prefs_common.addressbook_use_editaddress_dialog) {
editaddress_vbox = gtk_vbox_new(FALSE, 4);
}
#endif
if( item ) {
- gchar *filename = addritem_person_get_picture(item);
- if (filename && is_file_exist(filename))
- claws_unlink(filename);
- g_free(filename);
+ addritem_person_remove_picture(item);
addritem_free_item_person( item );
}
}
static gboolean tVal = TRUE;
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
gint column,
gpointer data )
{
- GtkEntry *entry = GTK_ENTRY(addrbook.entry);
AddrItemObject *aio = NULL;
AddressObject *pobj = NULL;
AdapterDSource *ads = NULL;
AddressDataSource *ds = NULL;
- gtk_entry_set_text( entry, "" );
addrbook.listSelected = node;
pobj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
addressbook_edit_person_invalidate(NULL, NULL, NULL);
}
+static void addressbook_entry_activated(GtkWidget *widget, gpointer data)
+{
+ addressbook_lup_clicked(NULL, NULL);
+}
+
static gboolean addressbook_list_button_pressed(GtkWidget *widget,
GdkEventButton *event,
gpointer data)
if( obj == NULL )
return FALSE;
- if (obj->type == ADDR_ITEM_GROUP) {
+ if (obj->type == ADDR_ITEM_GROUP ||
+ obj->type == ADDR_DATASOURCE) {
/* edit group */
addressbook_treenode_edit_cb(NULL, NULL);
} else {
iface = adapter->interface;
if( !iface )
goto just_set_sens;
- if( !iface->readOnly ) {
+ if( !iface->readOnly && iface->type == ADDR_IF_BOOK) {
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewBook", TRUE );
- gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
if( iface->externalQuery )
canLookup = TRUE;
}
if (obj->type == ADDR_DATASOURCE) {
+ canLookup = TRUE;
ads = ADAPTER_DSOURCE(obj);
ds = ads->dataSource;
if( !ds )
if( !iface )
goto just_set_sens;
if( !iface->readOnly ) {
- canDelete = TRUE;
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewFolder", TRUE );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/NewGroup", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
+ canDelete = TRUE;
canEdit = TRUE;
canTreeCopy = TRUE;
- if( iface->externalQuery )
- canLookup = TRUE;
}
else if (obj->type == ADDR_ITEM_FOLDER) {
+ canLookup = TRUE;
ds = addressbook_find_datasource( node );
if( !ds )
goto just_set_sens;
if( iface->externalQuery ) {
/* Enable deletion of LDAP folder */
- canLookup = TRUE;
canDelete = TRUE;
}
}
else if (obj->type == ADDR_ITEM_GROUP) {
+ canLookup = TRUE;
ds = addressbook_find_datasource( node );
if( !ds )
goto just_set_sens;
canTreeCut = FALSE;
canTreePaste = FALSE;
canCut = FALSE;
- canDelete = FALSE;
canPaste = FALSE;
}
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABTreePopup/Paste", canTreePaste );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/EditBook", canEdit );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", canDelete );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", canCut );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", canCopy );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", canPaste );
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
}
"If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
obj->name );
aval = alertpanel( _("Delete folder"), message,
- GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
+ GTK_STOCK_CANCEL, g_strconcat("+",_("Delete _folder only"), NULL), _("Delete folder and _addresses"));
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
}
folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
- pobj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected);
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if (ds)
abf = ds->rawDataSource;
folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
if (!folder)
return;
- pobj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected);
+
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if (ds)
abf = ds->rawDataSource;
AddressObject *obj;
obj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), node );
- if( obj->type == ADDR_ITEM_GROUP ) {
+ if(obj && obj->type == ADDR_ITEM_GROUP ) {
ItemGroup *g = ADAPTER_GROUP(obj)->itemGroup;
if( g == group ) return node;
}
ctree = GTK_CMCTREE( addrbook.ctree );
pobj = gtk_cmctree_node_get_row_data( ctree, addrbook.treeSelected );
- node = gtk_cmctree_find_by_row_data( ctree, addrbook.treeSelected, obj );
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) return;
if( obj->type == ADDR_ITEM_EMAIL ) {
ItemEMail *email = ( ItemEMail * ) obj;
- if( email == NULL ) return;
+
if( pobj && pobj->type == ADDR_ITEM_GROUP ) {
/* Edit parent group */
AdapterGroup *adapter = ADAPTER_GROUP(pobj);
return str;
}
+static gboolean addressbook_match_item(const gchar *name,
+ const gchar *email_alias,
+ const gchar *addr,
+ const gchar *remarks,
+ const gchar *str)
+{
+ if (!name)
+ return FALSE;
+ if (!str || str[0] == '\0')
+ return TRUE;
+ if (strcasestr(name, str))
+ return TRUE;
+ else if (email_alias && strcasestr(email_alias, str))
+ return TRUE;
+ else if (addr && strcasestr(addr, str))
+ return TRUE;
+ else if (remarks && strcasestr(remarks, str))
+ return TRUE;
+
+ return FALSE;
+}
+
static void addressbook_load_group( GtkCMCTree *clist, ItemGroup *itemGroup ) {
GList *items = itemGroup->listEMail;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+ const gchar *search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCMCTreeNode *nodeEMail = NULL;
gchar *text[N_LIST_COLS];
if( ! email ) continue;
person = ( ItemPerson * ) ADDRITEM_PARENT(email);
+
+ if( !addressbook_match_item(ADDRITEM_NAME(person),
+ ADDRITEM_NAME(email),
+ email->address, email->remarks,
+ search_str))
+ continue;
+
str = addressbook_format_item_clist( person, email );
if( str ) {
text[COL_NAME] = addressbook_set_col_name_guard(str);
}
static void addressbook_folder_load_person( GtkCMCTree *clist, ItemFolder *itemFolder ) {
- GList *items;
+ GList *items, *cur;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+ const gchar *search_str;
if( atci == NULL ) return;
if( atciMail == NULL ) return;
+ search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
+
/* 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 );
+ for(cur = items ; cur != NULL; cur = g_list_next( cur ) ) {
+ ItemPerson *person;
+ GList *node;
+ ItemEMail *email;
+
+ person = (ItemPerson *)cur->data;
+ if (!person)
+ continue;
+ node = person->listEMail;
+ if (node && node->data) {
+ email = node->data;
+ if (!addressbook_match_item(ADDRITEM_NAME(person), ADDRITEM_NAME(email), email->address, email->remarks, search_str))
+ continue;
+ } else {
+ if (!addressbook_match_item(ADDRITEM_NAME(person), NULL, NULL, NULL, search_str))
+ continue;
+ }
+
+ addressbook_folder_load_one_person( clist, cur->data, atci, atciMail );
}
/* Free up the list */
mgu_clear_list( items );
static void addressbook_folder_load_group( GtkCMCTree *clist, ItemFolder *itemFolder ) {
GList *items;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_GROUP );
+ const gchar *search_str;
/* Load any groups */
if( ! atci ) return;
+
+ search_str = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
+
items = addritem_folder_get_group_list( itemFolder );
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCMCTreeNode *nodeGroup = NULL;
gchar *text[N_LIST_COLS];
ItemGroup *group = items->data;
if( group == NULL ) continue;
+ if( !addressbook_match_item(ADDRITEM_NAME(group),
+ NULL, NULL, NULL, search_str) )
+ continue;
+
text[COL_NAME] = ADDRITEM_NAME(group);
text[COL_ADDRESS] = "";
text[COL_REMARKS] = "";
static gboolean migrate_addrbook(const gchar *origdir, const gchar *destdir)
{
- DIR *dp;
- struct dirent *d;
+ GDir *dp;
+ const gchar *d;
gboolean failed = FALSE;
+ GError *error = NULL;
- if( ( dp = opendir( origdir ) ) == NULL ) {
+ if( ( dp = g_dir_open( origdir, 0, &error ) ) == NULL ) {
+ debug_print("opening '%s' failed: %d (%s)\n", origdir,
+ error->code, error->message);
+ g_error_free(error);
return FALSE;
}
- while( ( d = readdir( dp ) ) != NULL ) {
- if (strncmp(d->d_name, "addrbook-", strlen("addrbook-")))
+ while( ( d = g_dir_read_name( dp ) ) != NULL ) {
+ if (strncmp(d, "addrbook-", strlen("addrbook-")))
continue;
else {
gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S,
- d->d_name, NULL);
+ d, NULL);
gchar *dest_file = g_strconcat(destdir, G_DIR_SEPARATOR_S,
- d->d_name, NULL);
+ d, NULL);
if (copy_file(orig_file, dest_file, FALSE) < 0) {
failed = TRUE;
}
}
}
}
+ g_dir_close( dp );
- closedir( dp );
if (!failed) {
/* all copies succeeded, we can remove source files */
- if( ( dp = opendir( origdir ) ) == NULL ) {
+ if( ( dp = g_dir_open( origdir, 0, &error ) ) == NULL ) {
+ debug_print("opening '%s' failed: %d (%s)\n", origdir,
+ error->code, error->message);
+ g_error_free(error);
return FALSE;
}
- while( ( d = readdir( dp ) ) != NULL ) {
- if (strncmp(d->d_name, "addrbook-", strlen("addrbook-")))
+ while( ( d = g_dir_read_name( dp ) ) != NULL ) {
+ if (strncmp(d, "addrbook-", strlen("addrbook-")))
continue;
else {
gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S,
- d->d_name, NULL);
+ d, NULL);
claws_unlink(orig_file);
g_free(orig_file);
}
}
- closedir( dp );
+ g_dir_close( dp );
}
return !failed;
void addressbook_read_file( void ) {
AddressIndex *addrIndex = NULL;
gchar *indexdir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, NULL);
-
+
debug_print( "Reading address index...\n" );
if( _addressIndex_ ) {
debug_print( "address book already read!!!\n" );
+ g_free(indexdir);
return;
}
if ( !is_dir_exist(indexdir) ) {
if ( make_dir(indexdir) < 0 ) {
addrindex_set_file_path( addrIndex, get_rc_dir() );
- g_warning( "couldn't create dir %s\n", indexdir);
+ g_warning( "couldn't create dir '%s'", indexdir);
} else {
if (!migrate_addrbook(get_rc_dir(), indexdir)) {
remove_dir_recursive(indexdir);
AddressInterface *iface;
gchar *searchTerm;
GtkCMCTreeNode *node, *parentNode;
+#ifdef USE_LDAP
+ LdapServer *ldap_server;
+ LdapControl *ldap_ctl;
+#endif
node = addrbook.treeSelected;
if( ! node ) return;
obj = gtk_cmctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
+ if (obj->type != ADDR_DATASOURCE ||
+ ADAPTER_DSOURCE(obj)->subType != ADDR_LDAP) {
+ addressbook_set_clist(
+ gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.ctree),
+ addrbook.treeSelected),
+ TRUE);
+ }
+
ds = addressbook_find_datasource( node );
if( ds == NULL ) return;
if( ! iface->haveLibrary ) return;
if( ! iface->externalQuery ) return;
+#ifdef USE_LDAP
+ if (iface->type == ADDR_IF_LDAP) {
+ ldap_server = ds->rawDataSource;
+ ldap_ctl = ldap_server->control;
+ if (ldap_ctl != NULL &&
+ ldap_ctl->bindDN != NULL && strlen(ldap_ctl->bindDN) > 0) {
+ /* LDAP server is password-protected. */
+ if (master_passphrase() == NULL) {
+ /* User did not enter master passphrase, do not start a search. */
+ return;
+ }
+ }
+ }
+#endif
+
searchTerm =
gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
g_strchomp( searchTerm );
person = NULL;
if (obj->type == ADDR_ITEM_EMAIL) {
email = ( ItemEMail * ) obj;
- if (email == NULL)
- return;
person = (ItemPerson *) ADDRITEM_PARENT(email);
}
atci->iconXpm = icon; \
atci->iconXpmOpen = iconopen; \
} else { \
- g_warning("can't get atci %d\n", id); \
+ g_warning("can't get atci %d", id); \
} \
}
g_object_unref(ldapxpm);
if (addrsearchxpm)
g_object_unref(addrsearchxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacexpm );
- stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INTERFACE, &interfacexpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GROUP, &groupxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_VCARD, &vcardxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS, &addressxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_JPILOT, &jpilotxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CATEGORY, &categoryxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LDAP, &ldapxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
UPDATE_ICON_ATCI(ADDR_INTERFACE,folderxpm,folderopenxpm);
UPDATE_ICON_ATCI(ADDR_BOOK,bookxpm,bookxpm);
atci->showInTree = TRUE;
atci->treeExpand = TRUE;
atci->treeLeaf = FALSE;
- atci->displayName = _( "Address Book" );
+ atci->displayName = _("Address Books");
atci->menuCommand = "Menu/Book/NewBook";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
projects / claws.git / blobdiff