/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
#include <pthread.h>
#include "ldapserver.h"
#include "editldap.h"
+#include "ldapupdate.h"
#define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
#endif
static GHashTable *_addressBookTypeHash_ = NULL;
static GList *_addressBookTypeList_ = NULL;
+static void addressbook_new_address_from_book_post_cb( ItemPerson *person );
+static void addressbook_new_address_from_folder_post_cb( ItemPerson *person );
+static void addressbook_edit_address_post_cb( ItemPerson *person );
+
static void addressbook_create (void);
static gint addressbook_close (void);
static void addressbook_button_set_sensitive (void);
+static gboolean address_index_has_focus = FALSE;
+static gboolean address_list_has_focus = FALSE;
+
/* callback functions */
static void addressbook_del_clicked (GtkButton *button,
gpointer data);
static void addressbook_folder_remove_node (GtkCTree *clist,
GtkCTreeNode *node);
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+ gboolean force_focus );
+
/* LUT's and IF stuff */
static void addressbook_free_treenode ( gpointer data );
-AddressTypeControlItem *addrbookctl_lookup (gint ot);
-AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType ifType);
+static AddressTypeControlItem *addrbookctl_lookup (gint ot);
+static AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType ifType);
-void addrbookctl_build_map (GtkWidget *window);
-void addrbookctl_build_iflist (void);
-AdapterInterface *addrbookctl_find_interface (AddressIfType ifType);
-void addrbookctl_build_ifselect (void);
+static void addrbookctl_build_map (GtkWidget *window);
+static void addrbookctl_build_iflist (void);
+static AdapterInterface *addrbookctl_find_interface (AddressIfType ifType);
+static void addrbookctl_build_ifselect (void);
static void addrbookctl_free_interface (AdapterInterface *adapter);
static void addrbookctl_free_datasource (AdapterDSource *adapter);
static GtkTargetEntry addressbook_drag_types[] =
{
- {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+ {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
};
static GtkTargetList *addressbook_target_list = NULL;
{
{N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL},
{N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/New _Book"), NULL, addressbook_new_book_cb, 0, NULL},
{N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL},
{N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/C_ut"), NULL, addressbook_treenode_cut_cb, 0, NULL},
{N_("/_Copy"), NULL, addressbook_treenode_copy_cb, 0, NULL},
{N_("/_Paste"), NULL, addressbook_treenode_paste_cb, 0, NULL}
static GtkItemFactoryEntry addressbook_list_popup_entries[] =
{
{N_("/_Select all"), NULL, addressbook_select_all_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL},
{N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL},
{N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/C_ut"), NULL, addressbook_clip_cut_cb, 0, NULL},
{N_("/_Copy"), NULL, addressbook_clip_copy_cb, 0, NULL},
{N_("/_Paste"), NULL, addressbook_clip_paste_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
/* {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
{N_("/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
#ifdef USE_LDAP
* Lookup table of error messages for LDAP errors.
*/
static ErrMsgTableEntry _lutErrorsLDAP_[] = {
- { LDAPRC_SUCCESS, N_("Success") },
- { LDAPRC_CONNECT, N_("Error connecting to LDAP server") },
- { LDAPRC_INIT, N_("Error initializing LDAP") },
- { LDAPRC_BIND, N_("Error binding to LDAP server") },
- { LDAPRC_SEARCH, N_("Error searching LDAP database") },
- { LDAPRC_TIMEOUT, N_("Timeout performing LDAP operation") },
- { 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") },
- { 0, NULL }
+ { LDAPRC_SUCCESS, N_("Success") },
+ { LDAPRC_CONNECT, N_("Error connecting to LDAP server") },
+ { LDAPRC_INIT, N_("Error initializing LDAP") },
+ { LDAPRC_BIND, N_("Error binding to LDAP server") },
+ { LDAPRC_SEARCH, N_("Error searching LDAP database") },
+ { LDAPRC_TIMEOUT, N_("Timeout performing LDAP operation") },
+ { 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_NODN, N_("Distinguised Name (dn) is missing") },
+ { LDAPRC_NAMING_VIOLATION, N_("Missing required information") },
+ { LDAPRC_ALREADY_EXIST, N_("Another contact exists with that key") },
+ { LDAPRC_STRONG_AUTH, N_("Strong(er) authentication required") },
+ { 0, NULL }
};
#endif
static gboolean lastCanLookup = FALSE;
-void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
+static void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
{
if (add_and_delete) {
gtk_widget_show(addrbook.edit_btn);
}
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();
+
address_completion_start(addrbook.window);
addressbook_show_buttons(target == NULL, lastCanLookup, target != NULL);
/**
* Refresh addressbook and save to file(s).
*/
-void addressbook_refresh( void )
+static void addressbook_refresh( void )
{
if (addrbook.window) {
if (addrbook.treeSelected) {
{
if (event && event->keyval == GDK_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete)
- addressbook_del_clicked(NULL, NULL);
+ else if (event && event->keyval == GDK_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);
+ }
return FALSE;
}
addressbook_sort_list(clist, COL_REMARKS, sort_type);
}
+static gboolean addressbook_address_index_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_index_has_focus = TRUE;
+ return FALSE;
+}
+
+static gboolean addressbook_address_index_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_index_has_focus = FALSE;
+ if (!prefs_common.addressbook_use_editaddress_dialog
+ && !address_list_has_focus)
+ addressbook_address_list_disable_some_actions();
+ return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_list_has_focus = TRUE;
+ return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_list_has_focus = FALSE;
+ if (!prefs_common.addressbook_use_editaddress_dialog
+ && !address_index_has_focus)
+ addressbook_address_list_disable_some_actions();
+ return FALSE;
+}
+
+/* save hpane and vpane's handle position when it moves */
+static void addressbook_pane_save_position(void)
+{
+ if (addrbook.hpaned)
+ prefs_common.addressbook_hpaned_pos =
+ gtk_paned_get_position(GTK_PANED(addrbook.hpaned));
+ if (addrbook.vpaned)
+ prefs_common.addressbook_vpaned_pos =
+ gtk_paned_get_position(GTK_PANED(addrbook.vpaned));
+}
+
/*
* Create the address book widgets. The address book contains two CTree widgets: the
* address index tree on the left and the address list on the right.
GtkWidget *vbox2;
GtkWidget *ctree_swin;
GtkWidget *ctree;
+ GtkWidget *editaddress_vbox;
GtkWidget *clist_vbox;
GtkWidget *clist_swin;
GtkWidget *clist;
- GtkWidget *paned;
+ GtkWidget *hpaned;
+ GtkWidget *vpaned;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *entry;
index_titles[COL_SOURCES] = _("Sources");
/* Address book window */
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ 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_widget_realize(window);
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 + 40, -1);
+ 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);
g_signal_connect(G_OBJECT(ctree), "drag_data_received",
G_CALLBACK(addressbook_drag_received_cb),
ctree);
+ g_signal_connect(G_OBJECT(ctree), "focus_in_event",
+ G_CALLBACK(addressbook_address_index_focus_evt_in), NULL);
+ 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);
COL_NAME_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
COL_ADDRESS_WIDTH);
+ gtk_widget_set_size_request(clist, -1, 80);
addressbook_sort_list(GTK_CLIST(clist), COL_NAME, GTK_SORT_ASCENDING);
g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_NAME].button),
"clicked", G_CALLBACK(addressbook_address_clicked), clist);
g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_REMARKS].button),
"clicked", G_CALLBACK(addressbook_remarks_clicked), clist);
-
+ g_signal_connect(G_OBJECT(clist), "focus_in_event",
+ G_CALLBACK(addressbook_address_list_focus_evt_in), NULL);
+ g_signal_connect(G_OBJECT(clist), "focus_out_event",
+ G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
+
for (i = 0; i < N_LIST_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
GTK_CAN_FOCUS);
g_signal_connect(G_OBJECT(entry), "key_press_event",
G_CALLBACK(addressbook_entry_key_pressed),
NULL);
- paned = gtk_hpaned_new();
- gtk_box_pack_start(GTK_BOX(vbox2), paned, TRUE, TRUE, 0);
- gtk_paned_add1(GTK_PANED(paned), ctree_swin);
- gtk_paned_add2(GTK_PANED(paned), clist_vbox);
+
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ editaddress_vbox = gtk_vbox_new(FALSE, 4);
+ vpaned = gtk_vpaned_new();
+ 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();
+ 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), clist_vbox, TRUE, FALSE);
+ else
+ gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
/* Status bar */
hsbox = gtk_hbox_new(FALSE, 0);
G_CALLBACK(addressbook_lup_clicked), NULL);
to_btn = gtk_button_new_with_label
- (prefs_common.trans_hdr ? _("To:") : "To:");
+ (prefs_common_translated_header_name("To:"));
GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
cc_btn = gtk_button_new_with_label
- (prefs_common.trans_hdr ? _("Cc:") : "Cc:");
+ (prefs_common_translated_header_name("Cc:"));
GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
bcc_btn = gtk_button_new_with_label
- (prefs_common.trans_hdr ? _("Bcc:") : "Bcc:");
+ (prefs_common_translated_header_name("Bcc:"));
GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
NULL);
addrbook.window = window;
+ addrbook.hpaned = hpaned;
+ addrbook.vpaned = vpaned;
addrbook.menubar = menubar;
addrbook.ctree = ctree;
addrbook.ctree_swin
= ctree_swin;
+ addrbook.editaddress_vbox = editaddress_vbox;
addrbook.clist = clist;
addrbook.label = label;
addrbook.entry = entry;
gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
prefs_common.addressbookwin_height);
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ if (prefs_common.addressbook_vpaned_pos > 0)
+ gtk_paned_set_position(GTK_PANED(vpaned),
+ prefs_common.addressbook_vpaned_pos);
+ }
+ if (prefs_common.addressbook_hpaned_pos > 0)
+ gtk_paned_set_position(GTK_PANED(hpaned),
+ prefs_common.addressbook_hpaned_pos);
+
+
gtk_widget_show_all(window);
}
*/
static gint addressbook_close( void ) {
address_completion_end(addrbook.window);
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
+
+ addressbook_pane_save_position();
+
gtk_widget_hide(addrbook.window);
addressbook_export_to_file();
return TRUE;
if (addrbook.target_compose) {
to_sens = TRUE;
cc_sens = TRUE;
-#ifndef CLAWS
- if (addrbook.target_compose->use_bcc)
-#endif
- bcc_sens = TRUE;
+ bcc_sens = TRUE;
}
gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
}
else if( aio->type == ADDR_ITEM_PERSON ) {
ItemPerson *item = ( ItemPerson * ) aio;
+ item->status = DELETE_ENTRY;
addressbook_folder_remove_one_person( clist, item );
if (pobj->type == ADDR_ITEM_FOLDER)
addritem_folder_remove_person(ADAPTER_FOLDER(pobj)->itemFolder, item);
item = addrbook_remove_person( abf, item );
+#ifdef USE_LDAP
+ if (ds->type == ADDR_IF_LDAP) {
+ LdapServer *server = ds->rawDataSource;
+ ldapsvr_set_modified(server, TRUE);
+ ldapsvr_update_book(server, item);
+ }
+#endif
if( item ) {
addritem_free_item_person( item );
}
addressbook_new_address_cb( NULL, 0, NULL );
}
-gchar *addressbook_format_address( AddrItemObject * aio ) {
+static gchar *addressbook_format_address( AddrItemObject * aio ) {
gchar *buf = NULL;
gchar *name = NULL;
gchar *address = NULL;
g_signal_handlers_unblock_by_func
(G_OBJECT(ctree),
G_CALLBACK(addressbook_tree_selected), NULL);
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
/* Setup main menu selections */
addressbook_menubar_set_sensitive( FALSE );
iface = ds->interface;
if( ! iface->readOnly ) {
menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
- menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+ if (iface->type != ADDR_IF_LDAP)
+ menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
else if( pobj->type != ADDR_INTERFACE ) {
/* Parent object is not an interface */
ds = addressbook_find_datasource( addrbook.treeSelected );
+ if (!ds)
+ return;
iface = ds->interface;
if( ! iface->readOnly ) {
/* Folder or group */
}
/* Folder */
if( pobj->type == ADDR_ITEM_FOLDER ) {
- menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+ if (iface->type != ADDR_IF_LDAP)
+ menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
if( obj ) canEdit = TRUE;
}
if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
if( iface->type == ADDR_IF_LDAP ) {
if( obj ) canBrowse = TRUE;
canEdit = TRUE;
- canDelete = FALSE;
+ canDelete = TRUE;
}
}
if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
}
addressbook_list_menu_setup();
+
+ if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address(NULL, 0, NULL, FALSE);
}
static void addressbook_list_row_unselected( GtkCTree *ctree,
/* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_remove( aio );
}
+
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
}
/* from gdkevents.c */
addrbook.target_compose)
addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
else
+ if (prefs_common.addressbook_use_editaddress_dialog)
addressbook_edit_address_cb(NULL, 0, NULL);
lasttime = 0;
}
}
+static void addressbook_new_address_from_book_post_cb( ItemPerson *person )
+{
+ if( person && addrbook.treeSelected == addrbook.opened ) {
+ person->status = ADD_ENTRY;
+ gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+ addressbook_folder_refresh_one_person(
+ GTK_CTREE(addrbook.clist), person );
+ }
+ addressbook_address_list_set_focus();
+}
+
+static void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
+{
+ if( person && addrbook.treeSelected == addrbook.opened) {
+ person->status = ADD_ENTRY;
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+ addressbook_set_clist(
+ gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ addrbook.opened),
+ TRUE);
+ }
+ addressbook_address_list_set_focus();
+}
+
+/**
+ * Label (a format string) that is used to name each folder.
+ */
+static gchar *_queryFolderLabel_ = N_( "Search '%s'" );
+
+/**
+ * Search ctree widget callback function.
+ * \param pA Pointer to node.
+ * \param pB Pointer to data item being sought.
+ * \return Zero (0) if folder found.
+ */
+static int addressbook_treenode_find_folder_cb( gconstpointer pA, gconstpointer pB ) {
+ AddressObject *aoA;
+
+ aoA = ( AddressObject * ) pA;
+ if( aoA->type == ADDR_ITEM_FOLDER ) {
+ ItemFolder *folder, *fld;
+
+ fld = ADAPTER_FOLDER(aoA)->itemFolder;
+ folder = ( ItemFolder * ) pB;
+ if( fld == folder ) return 0; /* Found folder */
+ }
+ return 1;
+}
+
+static ItemFolder * addressbook_setup_subf(
+ AddressDataSource *ds, gchar *title,
+ GtkCTreeNode *pNode )
+{
+ AddrBookBase *adbase;
+ AddressCache *cache;
+ ItemFolder *folder;
+ GtkCTree *ctree;
+ GtkCTreeNode *nNode;
+ gchar *name;
+ AddressObjectType aoType = ADDR_NONE;
+ GList *children;
+ /* Setup a query */
+ if( *title == '\0' || strlen( title ) < 1 ) return NULL;
+
+ if( ds->type == ADDR_IF_LDAP ) {
+#if USE_LDAP
+ aoType = ADDR_LDAP_QUERY;
+#endif
+ }
+ else {
+ return NULL;
+ }
+
+ ctree = GTK_CTREE(addrbook.ctree);
+ /* Get reference to address cache */
+ adbase = ( AddrBookBase * ) ds->rawDataSource;
+ cache = adbase->addressCache;
+
+ if ((children = addrcache_get_list_folder(cache)) != NULL) {
+ GList *cur = children;
+ for (; cur; cur = cur->next) {
+ ItemFolder *child = (ItemFolder *) cur->data;
+ if (!strcmp2(ADDRITEM_NAME(child), title)) {
+ nNode = gtk_ctree_find_by_row_data_custom(
+ ctree, NULL, child,
+ addressbook_treenode_find_folder_cb );
+ if( nNode ) {
+ addrindex_remove_results( ds, child );
+ while( child->listPerson ) {
+ ItemPerson *item = ( ItemPerson * ) child->listPerson->data;
+ item = addrcache_remove_person( cache, item );
+ if( item ) {
+ addritem_free_item_person( item );
+ item = NULL;
+ }
+ }
+ gtk_sctree_select( GTK_SCTREE(ctree), nNode );
+ addrbook.treeSelected = nNode;
+ }
+ return child;
+ }
+ }
+ }
+
+ /* Create a folder */
+ folder = addrcache_add_new_folder( cache, NULL );
+ name = g_strdup_printf( "%s", title );
+ addritem_folder_set_name( folder, name );
+ addritem_folder_set_remarks( folder, "" );
+ g_free( name );
+
+ /* Now let's see the folder */
+ nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
+ gtk_ctree_expand( ctree, pNode );
+ if( nNode ) {
+ gtk_sctree_select( GTK_SCTREE(ctree), nNode );
+ addrbook.treeSelected = nNode;
+ return folder;
+ }
+ return NULL;
+}
+
static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
AddressObject *pobj = NULL;
AddressDataSource *ds = NULL;
AddressBookFile *abf = NULL;
-
+ debug_print("adding address\n");
pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
- if( pobj == NULL ) return;
+ if( pobj == NULL ) {
+ debug_print("no row data\n");
+ return;
+ }
ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
- if( ds == NULL ) return;
+ if( ds == NULL ) {
+ debug_print("no datasource\n");
+ return;
+ }
abf = ds->rawDataSource;
- if( abf == NULL ) return;
+ if( abf == NULL ) {
+ printf("no addressbook file\n");
+ return;
+ }
if( pobj->type == ADDR_DATASOURCE ) {
- if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
- /* New address */
- ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
- if( person && addrbook.treeSelected == addrbook.opened ) {
- gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
- addressbook_folder_refresh_one_person(
- GTK_CTREE(addrbook.clist), person );
+ if (ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ||
+ ADAPTER_DSOURCE(pobj)->subType == ADDR_LDAP) {
+ ItemPerson *person;
+ ItemFolder *folder = NULL;
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_LDAP) {
+ GtkCTreeNode *parentNode;
+ ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+ if( ds == NULL ) return;
+
+ /* We must have a datasource that is an external interface */
+ if( ! ds->interface->haveLibrary ) return;
+ if( ! ds->interface->externalQuery ) return;
+
+ if( pobj->type == ADDR_ITEM_FOLDER ) {
+ parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+ }
+ else {
+ parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
+ }
+ folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
+
+ pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+ ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+ abf = ds->rawDataSource;
}
+#endif
+ person = addressbook_edit_person( abf, folder, NULL, FALSE,
+ addrbook.editaddress_vbox,
+ addressbook_new_address_from_book_post_cb,
+ TRUE );
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_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 );
+ return;
+ }
+ }
+#endif
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_new_address_from_book_post_cb( person );
}
}
else if( pobj->type == ADDR_ITEM_FOLDER ) {
/* New address */
ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
- ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
- if( person ) {
- if (addrbook.treeSelected == addrbook.opened) {
- gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
- addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
- addrbook.opened),
- TRUE);
+ ItemPerson *person;
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_LDAP) {
+ GtkCTreeNode *parentNode;
+ ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+ if( ds == NULL ) return;
+
+ /* We must have a datasource that is an external interface */
+ if( ! ds->interface->haveLibrary ) return;
+ if( ! ds->interface->externalQuery ) return;
+
+ if( pobj->type == ADDR_ITEM_FOLDER ) {
+ parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+ }
+ else {
+ parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
+ }
+ folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
+ if (!folder)
+ return;
+ pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+ ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+ abf = ds->rawDataSource;
+ }
+#endif
+ person = addressbook_edit_person( abf, folder, NULL, FALSE,
+ addrbook.editaddress_vbox,
+ addressbook_new_address_from_folder_post_cb,
+ TRUE );
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_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 );
+ return;
}
}
+#endif
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_new_address_from_folder_post_cb( person );
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
/* New address in group */
ds = addressbook_find_datasource( addrbook.treeSelected );
if( ds == NULL ) return NULL;
- if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+ if( ds->type == ADDR_IF_BOOK || ds->type == ADDR_IF_LDAP ) abf = ds->rawDataSource;
return abf;
}
}
}
+static void addressbook_edit_address_post_cb( ItemPerson *person )
+{
+ if( person ) {
+
+ addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
+ invalidate_address_completion();
+ }
+ addressbook_address_list_set_focus();
+}
+
+void addressbook_address_list_set_focus( void )
+{
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ gtk_window_set_focus(GTK_WINDOW(addrbook.window), addrbook.clist);
+ addressbook_list_menu_setup();
+ }
+}
+
+void addressbook_address_list_disable_some_actions(void)
+{
+ /* disable address copy/pasting when editing contact's detail (embedded form) */
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", FALSE );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", FALSE );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", FALSE );
+
+ /* we're already editing contact's detail here */
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", FALSE );
+ gtk_widget_set_sensitive( addrbook.edit_btn, FALSE );
+}
+
static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+ addressbook_edit_address(data, action, widget, TRUE);
+}
+
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+ gboolean force_focus ) {
GtkCTree *clist = GTK_CTREE(addrbook.clist);
GtkCTree *ctree;
AddressObject *obj = NULL, *pobj = NULL;
/* Edit person - email page */
ItemPerson *person;
person = ( ItemPerson * ) ADDRITEM_PARENT(email);
- if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
- addressbook_folder_refresh_one_person( clist, person );
- invalidate_address_completion();
+ if ( addressbook_edit_person( abf, NULL, person, TRUE, addrbook.editaddress_vbox,
+ addressbook_edit_address_post_cb,
+ (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+ != NULL ) {
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_LDAP) {
+ ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+ person->status = UPDATE_ENTRY;
+ }
+#endif
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address_post_cb( person );
+ }
return;
}
}
else if( obj->type == ADDR_ITEM_PERSON ) {
/* Edit person - basic page */
ItemPerson *person = ( ItemPerson * ) obj;
- if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
- addressbook_folder_refresh_one_person( clist, person );
- invalidate_address_completion();
+ if( addressbook_edit_person( abf, NULL, person, FALSE, addrbook.editaddress_vbox,
+ addressbook_edit_address_post_cb,
+ (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+ != NULL ) {
+#ifdef USE_LDAP
+ if (abf->type == ADDR_IF_LDAP) {
+ ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+ person->status = UPDATE_ENTRY;
+ }
+#endif
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address_post_cb( person );
+ }
return;
}
else if( obj->type == ADDR_ITEM_GROUP ) {
gchar *text[N_LIST_COLS];
gboolean flgFirst = TRUE, haveAddr = FALSE;
GList *node;
+ AddressBookFile *abf = addressbook_get_book_file();
if( person == NULL ) return;
if( str ) {
text[COL_NAME] = str;
}
+#ifdef USE_LDAP
+ else if( abf->type == ADDR_IF_LDAP && person->nickName ) {
+ if (person->nickName) {
+ if (strcmp(person->nickName, "") != 0) {
+ text[COL_NAME] = person->nickName;
+ }
+ else {
+ text[COL_NAME] = ADDRITEM_NAME(person);
+ }
+ }
+ }
+#endif
else {
text[COL_NAME] = ADDRITEM_NAME(person);
}
return 1;
}
-/**
- * Search ctree widget callback function.
- * \param pA Pointer to node.
- * \param pB Pointer to data item being sought.
- * \return Zero (0) if folder found.
- */
-static int addressbook_treenode_find_folder_cb( gconstpointer pA, gconstpointer pB ) {
- AddressObject *aoA;
-
- aoA = ( AddressObject * ) pA;
- if( aoA->type == ADDR_ITEM_FOLDER ) {
- ItemFolder *folder, *fld;
-
- fld = ADAPTER_FOLDER(aoA)->itemFolder;
- folder = ( ItemFolder * ) pB;
- if( fld == folder ) return 0; /* Found folder */
- }
- return 1;
-}
-
/*
* Remove folder and group nodes from tree widget for items contained ("cut")
* in clipboard.
*/
}
-/**
- * Search completion callback function. This removes the query from the idle
- * list.
- *
- * \param queryID Query ID of search request.
- */
-void addressbook_clear_idler( gint queryID ) {
- gpointer ptrQID;
-
- /* Remove idler function */
- /* printf( "addressbook_clear_idler::%d::\n", queryID ); */
- ptrQID = GINT_TO_POINTER( queryID );
- if( ptrQID ) {
- gtk_idle_remove_by_data( ptrQID );
- }
-}
-
/**
* Search completion callback function. This removes the query from the idle
* list.
/* Remove idler function */
ptrQID = GINT_TO_POINTER( queryID );
if( ptrQID ) {
- gtk_idle_remove_by_data( ptrQID );
+ g_idle_remove_by_data( ptrQID );
}
/* Refresh addressbook contents */
addrindex_stop_search( queryID );
}
-/**
- * Label (a format string) that is used to name each folder.
- */
-static gchar *_queryFolderLabel_ = N_( "Search '%s'" );
-
/**
* Perform search.
*
AddrBookBase *adbase;
AddressCache *cache;
ItemFolder *folder;
- GtkCTree *ctree;
- GtkCTreeNode *nNode;
gchar *name;
gint queryID;
guint idleID;
+#ifdef USE_LDAP
AddressObjectType aoType = ADDR_NONE;
+#endif
/* Setup a query */
if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
else {
return;
}
-
/* Get reference to address cache */
adbase = ( AddrBookBase * ) ds->rawDataSource;
cache = adbase->addressCache;
/* Create a folder for the search results */
- folder = addrcache_add_new_folder( cache, NULL );
name = g_strdup_printf( _queryFolderLabel_, searchTerm );
- addritem_folder_set_name( folder, name );
- addritem_folder_set_remarks( folder, "" );
+ folder = addressbook_setup_subf(ds, name, pNode);
g_free( name );
- /* Now let's see the folder */
- ctree = GTK_CTREE(addrbook.ctree);
- nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
- gtk_ctree_expand( ctree, pNode );
- if( nNode ) {
- gtk_sctree_select( GTK_SCTREE(ctree), nNode );
- addrbook.treeSelected = nNode;
- }
-
/* Setup the search */
queryID = addrindex_setup_explicit_search(
ds, searchTerm, folder, addressbook_search_callback_end, NULL );
if( queryID == 0 ) return;
/* Set up idler function */
- idleID = gtk_idle_add(
+ idleID = g_idle_add(
( GtkFunction ) addressbook_search_idle,
GINT_TO_POINTER( queryID ) );
/*
* Build table that controls the rendering of object types.
*/
-void addrbookctl_build_map( GtkWidget *window ) {
+static void addrbookctl_build_map( GtkWidget *window ) {
AddressTypeControlItem *atci;
/* Build icons */
/*
* Search for specified object type.
*/
-AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
+static AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
gint objType = ot;
return ( AddressTypeControlItem * ) g_hash_table_lookup( _addressBookTypeHash_, &objType );
}
/*
* Search for specified interface type.
*/
-AddressTypeControlItem *addrbookctl_lookup_iface( AddressIfType ifType ) {
+static AddressTypeControlItem *addrbookctl_lookup_iface( AddressIfType ifType ) {
GList *node = _addressBookTypeList_;
while( node ) {
AddressTypeControlItem *atci = node->data;
/**
* Build GUI interface list.
*/
-void addrbookctl_build_iflist( void ) {
+static void addrbookctl_build_iflist( void ) {
AddressTypeControlItem *atci;
AdapterInterface *adapter;
GList *list = NULL;
* \param ifType Interface type.
* \return Interface item, or NULL if not found.
*/
-AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
+static AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
GList *node = _addressInterfaceList_;
while( node ) {
AdapterInterface *adapter = node->data;
/**
* Build interface list selection.
*/
-void addrbookctl_build_ifselect( void ) {
+static void addrbookctl_build_ifselect( void ) {
GList *newList = NULL;
gchar *selectStr;
gchar **splitStr;
FolderInfo *fi;
FolderPathMatch *nextmatch = NULL;
+ if (!parentFolder)
+ return;
+
list = parentFolder->listFolder;
while ( list ) {
folder = list->data;
fi = addressbook_peek_subfolder_exists_create_folderinfo( fiParent->book, folder );
addressbook_peek_subfolder_exists_load_folder( folder, fi, nextmatch );
+ g_free(fi);
list = g_list_next( list );
}
}
/*
* This function is used by to check if a matcher book/folder path corresponds to an
existing addressbook book/folder ("" or "Any" are considered as valid, NULL invalid).
+ Caution: returned book and folder pointers can be NULL even when returning TRUE:
+ if book AND folder are NULL this means that folderpath was empty or Any.
+ If folderpath is a simple book name (without folder), book will not be NULL and folder
+ will be NULL. It's not expected to return book as NULL and folder as non NULL.
*/
gboolean addressbook_peek_folder_exists( gchar *folderpath,
AddressBookFile *abf;
FolderInfo *fi;
FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL, NULL };
- FolderPathMatch *nextmatch;
if ( book )
*book = NULL;
/* split the folder path we've received, we'll try to match this path, subpath by
subpath against the book/folder structure in order */
folder_path_match.folder_path = g_strsplit( folderpath, "/", 256 );
+ if (!folder_path_match.folder_path)
+ return FALSE;
list = addrindex_get_interface_list( _addressIndex_ );
- while ( list ) {
+ while ( list && !folder_path_match.matched ) {
AddressInterface *interface = list->data;
- if ( interface->type == ADDR_IF_BOOK ) {
+ if ( interface && interface->type == ADDR_IF_BOOK ) {
nodeDS = interface->listSource;
- while ( nodeDS ) {
+ while ( nodeDS && !folder_path_match.matched ) {
ds = nodeDS->data;
/* Read address book */
/* Add node for address book */
abf = ds->rawDataSource;
- /* try to match subfolders if this book is the right book
- (and if there's smth to match, and not yet matched) */
- nextmatch = NULL;
- if ( folder_path_match.folder_path != NULL &&
- folder_path_match.matched == FALSE &&
- strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
+ /* match book name */
+ if ( abf && abf->fileName &&
+ strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
+
debug_print("matched book name '%s'\n", abf->fileName);
- folder_path_match.index = 1;
- if ( folder_path_match.folder_path[folder_path_match.index] == NULL ) {
- /* we've matched all elements */
+ folder_path_match.book = ds;
+
+ if ( folder_path_match.folder_path[1] == NULL ) {
+ /* no folder part to match */
+
folder_path_match.matched = TRUE;
- folder_path_match.book = ds;
+ folder_path_match.folder = NULL;
debug_print("book path matched!\n");
+
} else {
- /* keep on matching */
- nextmatch = &folder_path_match;
- }
- }
+ /* match folder part */
- fi = addressbook_peek_subfolder_exists_create_folderinfo( abf, NULL );
+ fi = addressbook_peek_subfolder_exists_create_folderinfo( abf, NULL );
+ rootFolder = addrindex_ds_get_root_folder( ds );
- rootFolder = addrindex_ds_get_root_folder( ds );
- addressbook_peek_subfolder_exists_load_folder( rootFolder, fi, nextmatch );
+ /* prepare for recursive call */
+ folder_path_match.index = 1;
+ /* this call will set folder_path_match.matched and folder_path_match.folder */
+ addressbook_peek_subfolder_exists_load_folder( rootFolder, fi, &folder_path_match );
+ g_free(fi);
+ }
+ }
nodeDS = g_list_next( nodeDS );
}
projects / claws.git / blobdiff