/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 the Claws Mail team and 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <string.h>
#include <setjmp.h>
#include <sys/types.h>
-#include <dirent.h>
#include "main.h"
#include "addressbook.h"
#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"
#include "expldifdlg.h"
#include "browseldap.h"
#include "addrcustomattr.h"
-
+#ifdef G_OS_WIN32
+#undef interface
+#endif
typedef enum
{
COL_SOURCES = 0,
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 GtkTargetList *addressbook_target_list = NULL;
-static void about_show_cb(GtkAction *action, gpointer data)
-{
- about_show();
-}
-
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 },
/* 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 */
/* {"Tools/---", NULL, "---", NULL, NULL, NULL },*/
{"Tools/FindDuplicates", NULL, N_("Find duplicates..."), NULL, NULL, G_CALLBACK(addressbook_find_duplicates_cb) },
{"Tools/EditAttrs", NULL, N_("Edit custom attributes..."), NULL, NULL, G_CALLBACK(addressbook_edit_custom_attr_cb) },
-
-/* Help menu */
- {"Help/About", NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_show_cb) },
-
};
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") },
}
gtk_widget_show_all(addrbook.window);
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(addrbook.window));
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(addrbook.window));
-#endif
+
if (!prefs_common.addressbook_use_editaddress_dialog)
addressbook_edit_person_widgetset_hide();
}
if( _clipBoard_ != NULL ) {
addrclip_free( _clipBoard_ );
+ _clipBoard_ = NULL;
}
if( _addressIndex_ != NULL ) {
addrindex_free_index( _addressIndex_ );
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete) {
+ else if (event && event->keyval == GDK_KEY_Delete) {
/* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
if ( /* address_index_has_focus || */ address_list_has_focus )
addressbook_del_clicked(NULL, NULL);
{
cm_return_if_fail(allocation != NULL);
- prefs_common.addressbookwin_width = allocation->width;
- prefs_common.addressbookwin_height = allocation->height;
+ gtk_window_get_size(GTK_WINDOW(widget),
+ &prefs_common.addressbookwin_width, &prefs_common.addressbookwin_height);
}
static gint sort_column_number = 0;
gtk_cmclist_sort(clist);
for(pos = 0 ; pos < N_LIST_COLS ; pos++) {
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
label = gtk_label_new(gettext(list_titles[pos]));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
if(pos == col) {
- arrow = gtk_arrow_new(sort_type == GTK_SORT_ASCENDING ?
- GTK_ARROW_DOWN : GTK_ARROW_UP, GTK_SHADOW_IN);
+ arrow = gtk_image_new_from_icon_name(sort_type == GTK_SORT_ASCENDING ?
+ "pan-down-symbolic" : "pan-up-symbolic", GTK_ICON_SIZE_MENU);
gtk_box_pack_end(GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
}
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",
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
/* Menu bar */
gtk_action_group_add_actions(action_group, addressbook_list_popup_entries,
G_N_ELEMENTS(addressbook_list_popup_entries), NULL);
-#ifndef MAEMO
MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
-#else
- MENUITEM_ADDUI_MANAGER(ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
-#endif
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)
/* Book menu */
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Book", "NewBook", "Book/NewBook", GTK_UI_MANAGER_MENUITEM)
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)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "FindDuplicates", "Tools/FindDuplicates", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Tools", "EditAttrs", "Tools/EditAttrs", 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");
-#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
-#else
- hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
-#endif
- vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, BORDER_WIDTH);
gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 20, -1);
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[0].button,
- GTK_CAN_FOCUS);
+ 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);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- 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_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
gtk_cmctree_set_indent(GTK_CMCTREE(ctree), CTREE_INDENT);
gtk_cmclist_set_compare_func(GTK_CMCLIST(ctree),
g_signal_connect(G_OBJECT(ctree), "focus_out_event",
G_CALLBACK(addressbook_address_index_focus_evt_out), NULL);
- clist_vbox = gtk_vbox_new(FALSE, 4);
+ clist_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
clist_swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
/* Address list */
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_EXTENDED);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- 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_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_MULTIPLE);
+ 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);
gtk_cmctree_set_indent(GTK_CMCTREE(clist), CTREE_INDENT);
gtk_cmclist_set_column_width(GTK_CMCLIST(clist), COL_NAME,
G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
for (i = 0; i < N_LIST_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button,
- GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus(GTK_CMCLIST(clist)->column[i].button,
+ FALSE);
g_signal_connect(G_OBJECT(clist), "tree_select_row",
G_CALLBACK(addressbook_list_row_selected), NULL);
G_CALLBACK(addressbook_start_drag), NULL);
g_signal_connect(G_OBJECT(clist), "drag_data_get",
G_CALLBACK(addressbook_drag_data_get), NULL);
- hbox = gtk_hbox_new(FALSE, 4);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 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);
- vpaned = gtk_vpaned_new();
+ editaddress_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+ vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_paned_pack1(GTK_PANED(vpaned), clist_vbox, FALSE, FALSE);
gtk_paned_pack2(GTK_PANED(vpaned), editaddress_vbox, TRUE, FALSE);
} else {
vpaned = NULL;
editaddress_vbox = NULL;
}
- hpaned = gtk_hpaned_new();
+ hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox2), hpaned, TRUE, TRUE, 0);
gtk_paned_pack1(GTK_PANED(hpaned), ctree_swin, FALSE, FALSE);
if (prefs_common.addressbook_use_editaddress_dialog)
gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
/* Status bar */
- hsbox = gtk_hbox_new(FALSE, 0);
+ hsbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- hbbox = gtk_hbutton_box_new();
+ hbbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbbox), 2);
gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
gtkut_stock_button_add_help(hbbox, &help_btn);
- edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
- GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+ edit_btn = gtk_button_new_with_mnemonic("_Edit");
+ 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);
- GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
+ del_btn = gtk_button_new_with_mnemonic("_Delete");
+ 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);
- GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
+ reg_btn = gtk_button_new_with_mnemonic("_New");
+ 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);
- GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
+ lup_btn = gtkut_stock_button("edit-find", _("_Find"));
+ 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:"));
- GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
+ 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:"));
- GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
+ 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:"));
- GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
+ 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);
- GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+ close_btn = gtkut_stock_button("window-close", "_Close");
+ 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")));
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.addressbookwin_width,
prefs_common.addressbookwin_height);
#ifdef G_OS_WIN32
gtk_window_move(GTK_WINDOW(window), 48, 48);
iface = ds->interface;
if( iface->readOnly ) {
alertpanel( _("Delete address(es)"),
- _("This address data is readonly and cannot be deleted."),
- GTK_STOCK_CLOSE, NULL, NULL );
+ _("This address data is read-only and cannot be deleted."),
+ "window-close", _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST);
return;
}
item = node->data;
node = g_list_next( node );
aio = ( AddrItemObject * ) item->addressItem;
- if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_PERSON || aio->type == ITEMTYPE_EMAIL ) {
group_delete = FALSE;
break;
}
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 );
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, 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 );
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
+ ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_GROUP ) {
+ if( aio->type == ITEMTYPE_GROUP ) {
groups = g_list_prepend(groups, item);
}
- else if( aio->type == ADDR_ITEM_PERSON ) {
+ else if( aio->type == ITEMTYPE_PERSON ) {
persons = g_list_prepend(persons, item);
}
}
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemEMail *sitem = ( ItemEMail * ) aio;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(sitem);
if (!g_list_find_custom(persons, person, (GCompareFunc)(find_person))) {
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_GROUP ) {
+ if( aio->type == ITEMTYPE_GROUP ) {
ItemGroup *item = ( ItemGroup * ) aio;
GtkCMCTreeNode *nd = NULL;
nd = addressbook_find_group_node( addrbook.opened, item );
aio = ( AddrItemObject * ) item->addressItem;
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_PERSON ) {
+ if( aio->type == ITEMTYPE_PERSON ) {
ItemPerson *item = ( ItemPerson * ) aio;
item->status = DELETE_ENTRY;
addressbook_folder_remove_one_person( clist, item );
}
#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 );
}
}
if (!aio)
continue;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemEMail *sitem = ( ItemEMail * ) aio;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(sitem);
sitem = addrbook_person_remove_email( abf, person, sitem );
item = node->data;
node = g_list_next( node );
aio = ( AddrItemObject * ) item->addressItem;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemEMail *item = ( ItemEMail * ) aio;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
item = addrbook_person_remove_email( abf, person, item );
gchar *name = NULL;
gchar *address = NULL;
- if( aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_EMAIL ) {
ItemPerson *person = NULL;
ItemEMail *email = ( ItemEMail * ) aio;
address = email->address;
}
}
- else if( aio->type == ADDR_ITEM_PERSON ) {
+ else if( aio->type == ITEMTYPE_PERSON ) {
ItemPerson *person = ( ItemPerson * ) aio;
GList *node = person->listEMail;
item = node->data;
node = g_list_next( node );
aio = item->addressItem;
- if( aio->type == ADDR_ITEM_PERSON ||
- aio->type == ADDR_ITEM_EMAIL ) {
+ if( aio->type == ITEMTYPE_PERSON ||
+ aio->type == ITEMTYPE_EMAIL ) {
addr = addressbook_format_address( aio );
compose_entry_append(
compose, addr, (ComposeEntryType) data, PREF_NONE );
g_free( addr );
}
- else if( aio->type == ADDR_ITEM_GROUP ) {
+ else if( aio->type == ITEMTYPE_GROUP ) {
ItemGroup *group = ( ItemGroup * ) aio;
GList *nodeMail = group->listEMail;
while( nodeMail ) {
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 );
static gboolean tVal = TRUE;
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
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 );
GtkCMCTreeNode *nn;
aio = node->data;
- if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_GROUP ) {
+ if( ADDRESS_OBJECT_TYPE(aio) == ADDR_ITEM_GROUP ) {
ItemGroup *group;
group = ( ItemGroup * ) aio;
nn = addressbook_node_add_group( treeNode, ds, group );
+ if (nn == NULL) {
+ g_message("error adding addressbook group\n");
+ }
}
- else if( ADDRESS_OBJECT_TYPE(aio) == ITEMTYPE_FOLDER ) {
+ else if( ADDRESS_OBJECT_TYPE(aio) == ADDR_ITEM_FOLDER ) {
ItemFolder *folder;
folder = ( ItemFolder * ) aio;
nn = addressbook_node_add_folder(
treeNode, ds, folder, ADDR_ITEM_FOLDER );
+ if (nn == NULL) {
+ g_message("error adding addressbook folder\n");
+ }
}
node = g_list_next( node );
}
_clipBoard_->cutFlag = TRUE;
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
- /* addrclip_list_show( _clipBoard_, stdout ); */
+#ifdef DEBUG_ADDRBOOK
+ addrclip_list_show( _clipBoard_, stdout );
+#endif
}
/**
_clipBoard_->cutFlag = FALSE;
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
- /* addrclip_list_show( _clipBoard_, stdout ); */
+#ifdef DEBUG_ADDRBOOK
+ addrclip_list_show( _clipBoard_, stdout );
+#endif
}
/**
ds = addressbook_find_datasource( GTK_CMCTREE_NODE(addrbook.treeSelected) );
if( ds == NULL ) return;
if( addrindex_ds_get_readonly( ds ) ) {
- alertpanel_error( _("Cannot paste. Target address book is readonly.") );
+ alertpanel_error( _("Cannot paste. Target address book is read-only.") );
return;
}
folderGroup = addrclip_paste_copy( _clipBoard_, abf, folder );
}
- /* addrclip_list_show( _clipBoard_, stdout ); */
+#ifdef DEBUG_ADDRBOOK
+ addrclip_list_show( _clipBoard_, stdout );
+#endif
if( folderGroup ) {
/* Update tree by inserting node for each folder or group */
addressbook_treenode_add_list(
addressbook_treenode_to_clipboard();
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
- /* addrclip_list_show( _clipBoard_, stdout ); */
+#ifdef DEBUG_ADDRBOOK
+ addrclip_list_show( _clipBoard_, stdout );
+#endif
}
/**
addressbook_treenode_to_clipboard();
addrclip_clear( _clipBoard_ );
addrclip_add( _clipBoard_, _addressSelect_ );
- /* addrclip_list_show( _clipBoard_, stdout ); */
+#ifdef DEBUG_ADDRBOOK
+ addrclip_list_show( _clipBoard_, stdout );
+#endif
}
/**
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->button == 3 ) {
- gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
- event->button, event->time );
+ gtk_menu_popup_at_pointer(GTK_MENU(addrbook.list_popup), NULL);
} else if (event->button == 1) {
if (event->type == GDK_2BUTTON_PRESS) {
if (prefs_common.add_address_by_click &&
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);
if( event->button == 3 )
- gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(addrbook.tree_popup), NULL);
return FALSE;
}
GtkCMCTreeNode *nn;
nn = addressbook_node_add_folder(
addrbook.treeSelected, ds, folder, ADDR_ITEM_FOLDER );
+ if (nn == NULL) {
+ g_message("error adding addressbook folder\n");
+ }
gtk_cmctree_expand( ctree, addrbook.treeSelected );
if( addrbook.treeSelected == addrbook.opened )
addressbook_set_clist(obj, TRUE);
if( group ) {
GtkCMCTreeNode *nn;
nn = addressbook_node_add_group( addrbook.treeSelected, ds, group );
+ if (nn == NULL) {
+ g_message("error adding addressbook group\n");
+ }
gtk_cmctree_expand( ctree, addrbook.treeSelected );
if( addrbook.treeSelected == addrbook.opened )
addressbook_set_clist(obj, TRUE);
gtk_cmctree_get_node_info(ctree, node, text, &spacing,
&pix_cl, &pix_op,
&is_leaf, &expanded);
- gtk_sctree_set_node_info(ctree, node, name, spacing,
+ gtk_cmctree_set_node_info(ctree, node, name, spacing,
pix_cl, pix_op,
is_leaf, expanded);
}
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
+
ds = ads->dataSource;
if( ds == NULL ) return;
}
/* Confirm deletion */
delType = ADDRTREE_DEL_NONE;
if( obj->type == ADDR_ITEM_FOLDER ) {
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
message = g_strdup_printf( _(
"Do you want to delete the query " \
- "results and addresses in '%s' ?" ),
+ "results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+ NULL, _("_Cancel"), "edit-delete", _("D_elete"), NULL, NULL,
+ ALERTFOCUS_SECOND );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ADDR;
}
else {
message = g_strdup_printf
- ( _( "Do you want to delete '%s' ? "
+ ( _( "Do you want to delete '%s'? "
"If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
obj->name );
aval = alertpanel( _("Delete folder"), message,
- GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
+ NULL, _("_Cancel"), "edit-delete", _("Delete _folder only"),
+ "edit-delete", _("Delete folder and _addresses"), ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ONLY;
else if( obj->type == ADDR_ITEM_GROUP ) {
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will not be lost."), obj->name);
- aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
- "+" GTK_STOCK_DELETE, NULL);
+ aval = alertpanel(_("Delete"), message, NULL, _("_Cancel"),
+ "edit-delete", _("D_elete"), NULL, 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);
+ aval = alertpanel(_("Delete"), message, NULL, _("_Cancel"),
+ "edit-delete", _("D_elete"), NULL, NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}
if( obj->type == ADDR_DATASOURCE ) {
/* Remove node from tree */
gtk_cmctree_remove_node( ctree, node );
-
+
+ if (delType == ADDRTREE_DEL_DATA &&
+ ds->interface && ds->interface->type == ADDR_IF_BOOK)
+ addrbook_delete_book_file((AddressBookFile *) ds->rawDataSource);
+
/* Remove data source. */
if( addrindex_index_remove_datasource( _addressIndex_, ds ) ) {
addrindex_free_datasource( ds );
cache = adbase->addressCache;
/* Remove query results folder */
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
AdapterFolder *adapter = ADAPTER_FOLDER(obj);
ItemFolder *folder = adapter->itemFolder;
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 );
ItemPerson *person;
ItemFolder *folder = NULL;
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
GtkCMCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
}
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;
addressbook_new_address_from_book_post_cb,
TRUE );
#ifdef USE_LDAP
- if (ds && abf && abf->type == ADDR_IF_LDAP) {
+ if (ds && abf && abf->type == ADBOOKTYPE_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL );
+ "window-close", _("_Close"), NULL, NULL, NULL, NULL,
+ ALERTFOCUS_FIRST );
server->retVal = LDAPRC_SUCCESS;
return;
}
ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
ItemPerson *person;
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
GtkCMCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CMCTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
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;
addressbook_new_address_from_folder_post_cb,
TRUE );
#ifdef USE_LDAP
- if (ds && abf && abf->type == ADDR_IF_LDAP) {
+ if (ds && abf && abf->type == ADBOOKTYPE_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
if (server->retVal != LDAPRC_SUCCESS) {
alertpanel( _("Add address(es)"),
addressbook_err2string(_lutErrorsLDAP_, server->retVal),
- GTK_STOCK_CLOSE, NULL, NULL );
+ "window-close", _("_Close"), NULL, NULL, NULL, NULL, ALERTFOCUS_FIRST );
return;
}
}
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;
}
#ifdef USE_LDAP
AddressBookFile *abf = addressbook_get_book_file();
- if (abf && abf->type == ADDR_IF_LDAP) {
- if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
+ 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 ) {
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);
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf && abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADBOOKTYPE_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
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);
{
gchar *ret = "<not set>";
gchar *tmp = g_strdup(value);
- g_strstrip(tmp);
- if (tmp !=NULL && *tmp != '\0')
- ret = value;
- g_free(tmp);
+ if (tmp) {
+ g_strstrip(tmp);
+ if (*tmp != '\0')
+ ret = value;
+ g_free(tmp);
+ }
return ret;
}
text[COL_NAME] = addressbook_set_col_name_guard(str);
}
#ifdef USE_LDAP
- else if( abf && abf->type == ADDR_IF_LDAP &&
+ else if( abf && abf->type == ADBOOKTYPE_LDAP &&
person && person->nickName ) {
if (person->nickName) {
if (strcmp(person->nickName, "") != 0) {
}
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;
- gint row;
if( person == NULL ) return;
node = gtk_cmctree_find_by_row_data( clist, NULL, person );
- row = gtk_cmclist_find_row_from_data( GTK_CMCLIST(clist), person );
if( node ) {
addressbook_folder_remove_node( clist, node );
}
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( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- ds = ADAPTER_DSOURCE(obj)->dataSource;
+ ds = ads->dataSource;
if( ds ) {
/* Load root folder */
ItemFolder *rootFolder = NULL;
rootFolder = addrindex_ds_get_root_folder( ds );
addressbook_folder_load_person(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
addressbook_folder_load_group(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
}
}
else {
nodeDS = iface->listSource;
while( nodeDS ) {
ds = nodeDS->data;
- newNode = NULL;
name = addrindex_ds_get_name( ds );
ads = addressbook_create_ds_adapter(
ds, atci->objectType, name );
newNode = addressbook_add_object(
node, ADDRESS_OBJECT(ads) );
+ if (newNode == NULL) {
+ g_message("error adding addressbook object\n");
+ }
nodeDS = g_list_next( nodeDS );
}
gtk_cmctree_expand( ctree, node );
}
}
}
- if( errFlag ) {
+ 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);
- }
- else if( msg ) {
+ "window-close", _("_Close"), NULL, NULL, 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);
+ "window-close", _("_Close"), NULL, NULL, 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);
+ "window-close", _("_Close"), NULL, NULL, NULL, NULL,
+ ALERTFOCUS_FIRST, FALSE, NULL, ALERT_ERROR);
}
debug_print( "done.\n" );
}
{
GtkCMCTree *ctree = GTK_CMCTREE(addrbook.ctree);
GtkCMCTreeNode *newNode = NULL;
- AdapterFolder *adapter;
AddressTypeControlItem *atci = NULL;
GList *listItems = NULL;
gchar *name;
newNode = node;
}
else {
- adapter = g_new0( AdapterFolder, 1 );
+ AdapterFolder *adapter = g_new0( AdapterFolder, 1 );
ADDRESS_OBJECT_TYPE(adapter) = ADDR_ITEM_FOLDER;
ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemFolder) );
adapter->itemFolder = itemFolder;
if( newNode ) {
gtk_cmctree_node_set_row_data_full( ctree, newNode, adapter,
addressbook_free_treenode );
+ } else {
+ addrbookctl_free_folder(adapter);
}
}
static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter))
addressbook_lup_clicked(NULL, NULL);
return FALSE;
}
AddressDataSource *ds, gchar *searchTerm,
GtkCMCTreeNode *pNode )
{
- AddrBookBase *adbase;
- AddressCache *cache;
ItemFolder *folder;
gchar *name;
gint queryID;
guint idleID;
-#ifdef USE_LDAP
- AddressObjectType aoType = ADDR_NONE;
-#endif
/* Setup a query */
if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
- if( ds && ds->type == ADDR_IF_LDAP ) {
-#if USE_LDAP
- aoType = ADDR_LDAP_QUERY;
-#endif
- }
- else {
- return;
- }
- /* Get reference to address cache */
- adbase = ( AddrBookBase * ) ds->rawDataSource;
- cache = adbase->addressCache;
+ if( !ds || ds->type != ADDR_IF_LDAP ) return;
/* Create a folder for the search results */
name = g_strdup_printf( _queryFolderLabel_, searchTerm );
/* Set up idler function */
idleID = g_idle_add(
- ( GtkFunction ) addressbook_search_idle,
+ (GSourceFunc) addressbook_search_idle,
GINT_TO_POINTER( queryID ) );
+ if (idleID == 0) {
+ g_message("error adding addressbook_search_idle\n");
+ }
/* Start search, sit back and wait for something to happen */
addrindex_start_search( queryID );
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 (primary_passphrase() == NULL) {
+ /* User did not enter primary 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 );
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 );
gint ifType;
gint i;
gchar *endptr = NULL;
- gboolean enabled;
+ /* gboolean enabled; */
AdapterInterface *adapter;
selectStr = g_strdup( ADDRESSBOOK_IFACE_SELECTION );
if( splitStr[i] ) {
/* g_print( "%d : %s\n", i, splitStr[i] ); */
ifType = strtol( splitStr[i], &endptr, 10 );
- enabled = TRUE;
+ /* enabled = TRUE;
if( *endptr ) {
if( strcmp( endptr, "/n" ) == 0 ) {
enabled = FALSE;
}
}
+ */
/* g_print( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
adapter = addrbookctl_find_interface( ifType );
if( adapter ) {
g_free( selectStr );
/* Replace existing list */
- mgu_clear_list( _addressIFaceSelection_ );
g_list_free( _addressIFaceSelection_ );
_addressIFaceSelection_ = newList;
newList = NULL;
newNode = addressbook_add_object(
adapter->treeNode,
ADDRESS_OBJECT(ads) );
+ if (newNode == NULL) {
+ g_message("error adding addressbook object\n");
+ }
}
}
if (addressbook_target_list == NULL)
addressbook_target_list = gtk_target_list_new(
addressbook_drag_types, 1);
- context = gtk_drag_begin(widget, addressbook_target_list,
- GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
+ context = gtk_drag_begin_with_coordinates(widget, addressbook_target_list,
+ GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event,
+ -1, -1);
gtk_drag_set_icon_default(context);
}
for(cur = GTK_CMCLIST(addrbook.clist)->selection; cur; cur = cur->next) {
aio = (AddrItemObject *)gtk_cmctree_node_get_row_data(GTK_CMCTREE(addrbook.clist),
GTK_CMCTREE_NODE(cur->data));
- while (aio && aio->type != ADDR_ITEM_PERSON) {
+ while (aio && aio->type != ITEMTYPE_PERSON) {
aio = aio->parent;
}
}
- if (aio && aio->type == ADDR_ITEM_PERSON) {
+ if (aio && aio->type == ITEMTYPE_PERSON) {
if( ds && ds->interface && ds->interface->readOnly)
gtk_selection_data_set(selection_data,
- selection_data->target, 8,
+ gtk_selection_data_get_target(selection_data), 8,
(const guchar *)"Dummy_addr_copy", 15);
else
gtk_selection_data_set(selection_data,
- selection_data->target, 8,
+ gtk_selection_data_get_target(selection_data), 8,
(const guchar *)"Dummy_addr_move", 15);
}
}
guint time,
void *data)
{
+ GtkAllocation allocation;
+ GtkRequisition requisition;
gint row, column;
GtkCMCTreeNode *node = NULL;
gboolean acceptable = FALSE;
- gint height = addrbook.ctree->allocation.height;
- gint total_height = addrbook.ctree->requisition.height;
+ gtk_widget_get_allocation(GTK_WIDGET(addrbook.ctree), &allocation);
+ gint height = allocation.height;
+ gtk_widget_get_requisition(GTK_WIDGET(addrbook.ctree), &requisition);
+ gint total_height = requisition.height;
GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(addrbook.ctree_swin));
- gfloat vpos = pos->value;
+ gfloat vpos = gtk_adjustment_get_value(pos);
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - 24, y - 24, &row, &column)) {
if (y > height - 24 && height + vpos < total_height) {
gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
- gtk_adjustment_changed(pos);
}
if (y < 24 && y > 0) {
gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
- gtk_adjustment_changed(pos);
}
node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
if (node != NULL) {
AddressObject *obj = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node );
+ if (obj == NULL)
+ return FALSE;
if( obj->type == ADDR_ITEM_FOLDER
|| obj->type == ADDR_ITEM_GROUP)
acceptable = TRUE;
AdapterDSource *ads = NULL;
AddressDataSource *ds = NULL;
ads = ADAPTER_DSOURCE(obj);
- if (ads == NULL ){ return FALSE;}
ds = ads->dataSource;
if (ds == NULL ) { return FALSE;}
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
gdk_drag_status(context,
- (context->actions == GDK_ACTION_COPY ?
+ (gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
} else {
gdk_drag_status(context, 0, time);
GtkCMCTreeNode *node;
GtkCMCTreeNode *lastopened = addrbook.opened;
- if (!strncmp(data->data, "Dummy_addr", 10)) {
+ if (!strncmp(gtk_selection_data_get_data(data), "Dummy_addr", 10)) {
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - 24, y - 24, &row, &column) == 0) {
return;
return;
gtk_cmclist_freeze(GTK_CMCLIST(addrbook.clist));
- if (drag_context->action == GDK_ACTION_COPY ||
- !strcmp(data->data, "Dummy_addr_copy"))
+ if (gdk_drag_context_get_selected_action(drag_context) == GDK_ACTION_COPY ||
+ !strcmp(gtk_selection_data_get_data(data), "Dummy_addr_copy"))
addressbook_clip_copy_cb(NULL, NULL);
else
addressbook_clip_cut_cb(NULL, NULL);
projects / claws.git / blobdiff