#include "xml.h"
#include "prefs_gtk.h"
#include "procmime.h"
+#include "file-utils.h"
#include "utils.h"
#include "gtkutils.h"
#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"
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);
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 );
static GtkActionEntry addressbook_entries[] =
{
- {"Menu", NULL, "Menu" },
+ {"Menu", NULL, "Menu", NULL, NULL, NULL },
/* menus */
- {"Book", NULL, N_("_Book") },
- {"Address", NULL, N_("_Edit") },
- {"Tools", NULL, N_("_Tools") },
- {"Help", NULL, N_("_Help") },
+ {"Book", NULL, N_("_Book"), NULL, NULL, NULL },
+ {"Edit", NULL, N_("_Edit"), NULL, NULL, NULL },
+ {"Tools", NULL, N_("_Tools"), NULL, NULL, NULL },
+ {"Help", NULL, N_("_Help"), NULL, NULL, NULL },
/* Book menu */
{"Book/NewBook", NULL, N_("New _Book"), "<control>B", NULL, G_CALLBACK(addressbook_new_book_cb) },
{"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 */
static GtkActionEntry addressbook_tree_popup_entries[] =
{
- {"ABTreePopup", NULL, "ABTreePopup" },
+ {"ABTreePopup", NULL, "ABTreePopup", NULL, NULL, NULL },
{"ABTreePopup/EditBook", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_treenode_edit_cb) },
{"ABTreePopup/DeleteBook", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(addressbook_treenode_delete_cb) },
{"ABTreePopup/---", NULL, "---", NULL, NULL, NULL },
static GtkActionEntry addressbook_list_popup_entries[] =
{
- {"ABListPopup", NULL, "ABListPopup" },
+ {"ABListPopup", NULL, "ABListPopup", NULL, NULL, NULL },
{"ABListPopup/SelectAll", NULL, N_("_Select all"), NULL, NULL, G_CALLBACK(addressbook_select_all_cb) },
{"ABListPopup/---", NULL, "---", NULL, NULL, NULL },
{"ABListPopup/Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_edit_address_cb) },
#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_ );
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addressbook");
gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_realize(window);
g_signal_connect(G_OBJECT(window), "delete_event",
MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Book", "Book", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Address", "Address", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Tools", "Tools", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu", "Help", "Help", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "Close", "Book/Close", GTK_UI_MANAGER_MENUITEM)
/* Address menu */
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "SelectAll", "Address/SelectAll", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator1", "Address/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Cut", "Address/Cut", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Copy", "Address/Copy", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Paste", "Address/Paste", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator2", "Address/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Edit", "Address/Edit", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Delete", "Address/Delete", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "Separator3", "Address/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Address", "NewAddress", "Address/NewAddress", GTK_UI_MANAGER_MENUITEM)
- 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/Edit", "SelectAll", "Address/SelectAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Separator1", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Cut", "Address/Cut", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Copy", "Address/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Paste", "Address/Paste", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Separator2", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Edit", "Address/Edit", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Delete", "Address/Delete", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Separator3", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "NewAddress", "Address/NewAddress", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "NewGroup", "Address/NewGroup", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Separator4", "Address/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Mailto", "Address/Mailto", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Edit", "Merge", "Address/Merge", GTK_UI_MANAGER_MENUITEM)
/* Tools menu */
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "ImportLDIF", "Tools/ImportLDIF", GTK_UI_MANAGER_MENUITEM)
/* Help menu */
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
+ gtk_window_add_accel_group(GTK_WINDOW(window),
+ gtk_ui_manager_get_accel_group(ui_manager));
+
menubar = gtk_ui_manager_get_widget(ui_manager, "/Menu");
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
/* 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);
gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), 0, COL_FOLDER_WIDTH);
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_MULTIPLE);
- gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_NONE);
gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
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",
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);
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/Book/DeleteBook", sensitive );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/NewFolder", sensitive );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/SelectAll", TRUE );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", sensitive );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", sensitive );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/SelectAll", TRUE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Cut", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Copy", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Paste", sensitive );
- 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/Edit/NewAddress", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/NewGroup", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Mailto", sensitive );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Merge", sensitive );
gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
}
canEdit = FALSE;
/* Enable add */
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewAddress", editAddress );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/NewGroup", canAdd );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/NewAddress", editAddress );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/NewGroup", canAdd );
cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/NewFolder", canAdd );
gtk_widget_set_sensitive( addrbook.reg_btn, editAddress );
/* Enable edit */
- 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/Edit/Edit", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Delete", canDelete );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
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/Paste", canPaste );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Cut", canCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Copy", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Paste", canPaste );
- 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/Edit/Edit", canEdit );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Delete", canDelete );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Mailto", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Merge", canMerge );
gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
if( ! addrselect_test_empty( _addressSelect_ ) ) {
listAddress = addrselect_build_list( _addressSelect_ );
compose_new_with_list( NULL, listAddress );
- mgu_free_dlist( listAddress );
+ g_list_free_full( listAddress, g_free );
listAddress = NULL;
}
}
+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,
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( ! event ) return FALSE;
+ if( event->window != GTK_CMCLIST(widget)->clist_window ) return FALSE;
addressbook_list_menu_setup();
if( ! event ) return FALSE;
/* if( ! event || event->type != GDK_BUTTON_PRESS) return FALSE;*/
+ if( event->window != clist->clist_window )
+ return FALSE;
+
if (event->button == 1) {
if (event->type == GDK_2BUTTON_PRESS) {
if( gtk_cmclist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
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/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 );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Book/DeleteBook", canDelete );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Cut", canCut );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Copy", canCopy );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Paste", canPaste );
addressbook_show_buttons(addrbook.target_compose == NULL, canLookup,
addrbook.target_compose != NULL);
"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, _("+Delete _folder only"), _("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;
}
GList *cur = children;
for (; cur; cur = cur->next) {
ItemFolder *child = (ItemFolder *) cur->data;
- if (!strcmp2(ADDRITEM_NAME(child), title)) {
+ if (!g_strcmp0(ADDRITEM_NAME(child), title)) {
nNode = gtk_cmctree_find_by_row_data_custom(
ctree, NULL, child,
addressbook_treenode_find_folder_cb );
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;
}
}
AddressBookFile *abf = addressbook_get_book_file();
if (abf && abf->type == ADBOOKTYPE_LDAP) {
- if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+ if (g_strcmp0(person->nickName, ADDRITEM_NAME(person)))
addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
}
#endif
void addressbook_address_list_disable_some_actions(void)
{
/* disable address copy/pasting when editing contact's detail (embedded form) */
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Cut", FALSE );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Copy", FALSE );
- cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Address/Paste", FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Cut", FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Copy", FALSE );
+ cm_menu_set_sensitive_full( addrbook.ui_manager, "Menu/Edit/Paste", FALSE );
}
static void addressbook_edit_address_cb( GtkAction *action, gpointer data ) {
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 );
g_list_free( 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;
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] = "";
gtk_sctree_sort_node(clist, NULL);
}
/* Free up the list */
- mgu_clear_list( items );
g_list_free( items );
}
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;
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);
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;
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) {
+#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 );
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 );
g_free( selectStr );
/* Replace existing list */
- mgu_clear_list( _addressIFaceSelection_ );
g_list_free( _addressIFaceSelection_ );
_addressIFaceSelection_ = newList;
newList = NULL;
projects / claws.git / blobdiff