#include "codeconv.h"
#include "about.h"
#include "addr_compl.h"
+#include "password.h"
#include "mgutils.h"
#include "addressitem.h"
#include "addrcache.h"
#include "addrbook.h"
#include "addrindex.h"
+#include "addrmerge.h"
#include "addressadd.h"
#include "addrduplicates.h"
#include "addressbook_foldersel.h"
ItemPerson *person,
AddressTypeControlItem *atci,
AddressTypeControlItem *atciMail);
-static void addressbook_folder_refresh_one_person(GtkCMCTree *clist,
- ItemPerson *person);
-static void addressbook_folder_remove_one_person(GtkCMCTree *clist,
- ItemPerson *person);
static void addressbook_folder_remove_node (GtkCMCTree *clist,
GtkCMCTreeNode *node);
static void addressbook_treenode_paste_cb ( GtkAction *action, gpointer data );
static void addressbook_mail_to_cb ( GtkAction *action, gpointer data );
+static void addressbook_merge_cb ( GtkAction *action, gpointer data );
#ifdef USE_LDAP
static void addressbook_browse_entry_cb ( GtkAction *action, gpointer data );
{"Address/NewGroup", NULL, N_("New _Group"), "<control>G", NULL, G_CALLBACK(addressbook_new_group_cb) },
/* {"Address/---", NULL, "---", NULL, NULL, NULL }, */
{"Address/Mailto", NULL, N_("_Mail To"), "<control>M", NULL, G_CALLBACK(addressbook_mail_to_cb) },
+ {"Address/Merge", NULL, N_("_Merge"), "<control>E", NULL, G_CALLBACK(addressbook_merge_cb) },
/* Tools menu */
#ifdef USE_LDAP
{"ABListPopup/BrowseEntry", NULL, N_("_Browse Entry"), NULL, NULL, G_CALLBACK(addressbook_browse_entry_cb) },
#endif
+ {"ABListPopup/Merge", NULL, N_("_Merge"), NULL, NULL, G_CALLBACK(addressbook_merge_cb) },
};
/**
{ 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_ );
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "NewGroup", "Address/NewGroup", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator4", "Address/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Mailto", "Address/Mailto", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Merge", "Address/Merge", GTK_UI_MANAGER_MENUITEM)
/* Tools menu */
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ImportLDIF", "Tools/ImportLDIF", GTK_UI_MANAGER_MENUITEM)
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
- gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
+ gtk_widget_set_can_focus(GTK_CMCLIST(ctree)->column[0].button, FALSE);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
for (i = 0; i < N_LIST_COLS; i++)
- gtkut_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
FALSE);
g_signal_connect(G_OBJECT(clist), "tree_select_row",
gtkut_stock_button_add_help(hbbox, &help_btn);
edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
- gtkut_widget_set_can_default(edit_btn, TRUE);
+ gtk_widget_set_can_default(edit_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- gtkut_widget_set_can_default(del_btn, TRUE);
+ gtk_widget_set_can_default(del_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
- gtkut_widget_set_can_default(reg_btn, TRUE);
+ gtk_widget_set_can_default(reg_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
- gtkut_widget_set_can_default(lup_btn, TRUE);
+ gtk_widget_set_can_default(lup_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(help_btn), "clicked",
to_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("To:"));
- gtkut_widget_set_can_default(to_btn, TRUE);
+ gtk_widget_set_can_default(to_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
cc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Cc:"));
- gtkut_widget_set_can_default(cc_btn, TRUE);
+ gtk_widget_set_can_default(cc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
bcc_btn = gtk_button_new_with_label
(prefs_common_translated_header_name("Bcc:"));
- gtkut_widget_set_can_default(bcc_btn, TRUE);
+ gtk_widget_set_can_default(bcc_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- gtkut_widget_set_can_default(close_btn, TRUE);
+ gtk_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(to_btn), "clicked",
#ifdef USE_LDAP
MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "BrowseEntry", "ABListPopup/BrowseEntry", GTK_UI_MANAGER_MENUITEM)
#endif
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Popups/ABListPopup", "Merge", "ABListPopup/Merge", GTK_UI_MANAGER_MENUITEM)
list_popup = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
gtk_ui_manager_get_widget(ui_manager, "/Popups/ABListPopup")));
if( iface->readOnly ) {
alertpanel( _("Delete address(es)"),
_("This address data is readonly and cannot be deleted."),
- GTK_STOCK_CLOSE, NULL, NULL );
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST);
return;
}
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 );
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
} else {
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
}
#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 );
}
}
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewAddress", sensitive );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewGroup", sensitive );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Mailto", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Merge", sensitive );
gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
}
AdapterDSource *ads = NULL;
AddressInterface *iface = NULL;
AddressDataSource *ds = NULL;
+ GList *list;
+ AddrItemObject *aio;
+ AddrSelectItem *item;
gboolean canEdit = FALSE;
gboolean canDelete = FALSE;
gboolean canCut = FALSE;
gboolean canCopy = FALSE;
gboolean canPaste = FALSE;
gboolean canBrowse = FALSE;
+ gboolean canMerge = FALSE;
pobj = gtk_cmctree_node_get_row_data( GTK_CMCTREE(addrbook.ctree), addrbook.treeSelected );
if( pobj == NULL ) return;
canBrowse = FALSE;
}
+ /* Allow merging persons or emails are selected */
+ list = _addressSelect_->listSelect;
+ if (list && list->next ) {
+ item = list->data;
+ aio = ( AddrItemObject * ) item->addressItem;
+ if( aio->type == ITEMTYPE_EMAIL ||
+ aio->type == ITEMTYPE_PERSON ) {
+ canMerge = TRUE;
+ }
+ }
+
/* Forbid write changes when read-only */
if( iface && iface->readOnly ) {
canCut = FALSE;
canDelete = FALSE;
canPaste = FALSE;
+ canMerge = FALSE;
}
/* Now go finalize menu items */
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Paste", canPaste );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Mailto", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/Merge", canMerge );
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/Edit", canEdit );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Delete", canDelete );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Mailto", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Merge", canMerge );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
}
}
+static void addressbook_merge_list( AddrSelectList *list ) {
+ GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
+ GtkCMCTree *clist = GTK_CMCTREE(addrbook.clist);
+ AddressObject *pobj;
+ AddressDataSource *ds = NULL;
+
+ pobj = gtk_cmctree_node_get_row_data(ctree, addrbook.opened );
+ cm_return_if_fail(pobj != NULL);
+
+ ds = addressbook_find_datasource( addrbook.treeSelected );
+ if( ds == NULL ) return;
+
+ addrmerge_merge(clist, pobj, ds, list);
+}
+
+/**
+ * Merge selected entries in the address list
+ */
+static void addressbook_merge_cb( GtkAction *action, gpointer data ) {
+ if( addrselect_test_empty( _addressSelect_ ) )
+ return;
+
+ addressbook_merge_list( _addressSelect_ );
+}
+
static void addressbook_list_row_selected( GtkCMCTree *clist,
GtkCMCTreeNode *node,
gint column,
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( !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;
}
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 );
"results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ADDR;
"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, g_strconcat("+",_("Delete _folder only"), NULL), _("Delete folder and _addresses"));
+ GTK_STOCK_CANCEL, _("Delete _folder only"), _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
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);
+ GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
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);
+ GTK_STOCK_DELETE, NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL );
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
server->retVal = LDAPRC_SUCCESS;
return;
}
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL );
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
return;
}
}
}
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;
/* Load email addresses */
items = addritem_folder_get_person_list( itemFolder );
- for( ; items != NULL; items = g_list_next( items ) ) {
+ for(cur = items ; cur != NULL; cur = g_list_next( cur ) ) {
ItemPerson *person;
GList *node;
ItemEMail *email;
- person = (ItemPerson *)items->data;
+ person = (ItemPerson *)cur->data;
if (!person)
continue;
node = person->listEMail;
continue;
}
- addressbook_folder_load_one_person( clist, items->data, atci, atciMail );
+ addressbook_folder_load_one_person( clist, cur->data, atci, atciMail );
}
/* Free up the list */
mgu_clear_list( items );
addrbook.treeSelected );
}
-static void addressbook_folder_refresh_one_person( GtkCMCTree *clist, ItemPerson *person ) {
+void addressbook_folder_refresh_one_person( GtkCMCTree *clist, ItemPerson *person ) {
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
GtkCMCTreeNode *node;
}
}
-static void addressbook_folder_remove_one_person( GtkCMCTree *clist, ItemPerson *person ) {
+void addressbook_folder_remove_one_person( GtkCMCTree *clist, ItemPerson *person ) {
GtkCMCTreeNode *node;
if( person == NULL ) return;
if( errFlag ) {
debug_print( "Error\n%s\n", msg );
alertpanel_full(_("Addressbook conversion error"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, FALSE,
- NULL, ALERT_ERROR, G_ALERTDEFAULT);
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ NULL, ALERT_ERROR);
}
else if( msg ) {
debug_print( "Warning\n%s\n", msg );
alertpanel_full(_("Addressbook conversion error"), msg,
- GTK_STOCK_CLOSE, NULL, NULL, FALSE,
- NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ NULL, ALERT_WARNING);
}
return retVal;
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;
}
addrindex_print_index( addrIndex, stdout );
alertpanel_full(_("Addressbook Error"),
_("Could not read address index"),
- GTK_STOCK_CLOSE, NULL, NULL, FALSE,
- NULL, ALERT_ERROR, G_ALERTDEFAULT);
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST, FALSE,
+ NULL, ALERT_ERROR);
}
debug_print( "done.\n" );
}
AddressInterface *iface;
gchar *searchTerm;
GtkCMCTreeNode *node, *parentNode;
+#ifdef USE_LDAP
+ LdapServer *ldap_server;
+ LdapControl *ldap_ctl;
+#endif
node = addrbook.treeSelected;
if( ! node ) 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) {
+#ifndef PASSWORD_CRYPTO_OLD
+ /* LDAP server is password-protected. */
+ if (master_passphrase() == NULL) {
+ /* User did not enter master passphrase, do not start a search. */
+ return;
+ }
+#endif /* PASSWORD_CRYPTO_OLD */
+ }
+ }
+#endif /* USE_LDAP */
+
searchTerm =
gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
g_strchomp( searchTerm );
projects / claws.git / blobdiff