/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
#include "menu.h"
#include "stock_pixmap.h"
#include "xml.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "procmime.h"
#include "utils.h"
#include "gtkutils.h"
#include "editgroup.h"
#include "editaddress.h"
#include "editbook.h"
-#include "ldif.h"
#include "importldif.h"
-#include "mutt.h"
#include "importmutt.h"
+#include "importpine.h"
#ifdef USE_JPILOT
#include "jpilot.h"
#ifdef USE_LDAP
#include <pthread.h>
-#include "syldap.h"
+#include "ldapserver.h"
#include "editldap.h"
#define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
#include "addrselect.h"
#include "addrclip.h"
-
-/*
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/group.xpm"
-#include "pixmaps/interface.xpm"
-#include "pixmaps/book.xpm"
-#include "pixmaps/address.xpm"
-#include "pixmaps/vcard.xpm"
-#include "pixmaps/jpilot.xpm"
-#include "pixmaps/category.xpm"
-#include "pixmaps/ldap.xpm"
-*/
+#include "addrgather.h"
+#include "adbookbase.h"
+#include "exphtmldlg.h"
+#include "expldifdlg.h"
typedef enum
{
static GdkBitmap *categoryxpmmask;
static GdkPixmap *ldapxpm;
static GdkBitmap *ldapxpmmask;
+static GdkPixmap *addrsearchxpm;
+static GdkPixmap *addrsearchxpmmask;
/* Message buffer */
static gchar addressbook_msgbuf[ ADDRESSBOOK_MSGBUF_SIZE ];
static void addressbook_entry_changed (GtkWidget *widget);
#endif
-static void addressbook_list_button_pressed (GtkWidget *widget,
+static gboolean addressbook_list_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
-static void addressbook_list_button_released (GtkWidget *widget,
+static gboolean addressbook_list_button_released(GtkWidget *widget,
GdkEventButton *event,
gpointer data);
-static void addressbook_tree_button_pressed (GtkWidget *ctree,
+static gboolean addressbook_tree_button_pressed (GtkWidget *ctree,
GdkEventButton *event,
gpointer data);
-static void addressbook_tree_button_released (GtkWidget *ctree,
+static gboolean addressbook_tree_button_released(GtkWidget *ctree,
GdkEventButton *event,
gpointer data);
static void addressbook_popup_close (GtkMenuShell *menu_shell,
GtkCTreeNode *node);
static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
ItemGroup *group);
-static GtkCTreeNode *addressbook_find_folder_node( GtkCTreeNode *parent,
- ItemFolder *folder );
-
-static void addressbook_delete_object (AddressObject *obj);
-
-static void key_pressed (GtkWidget *widget,
+static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static gint addressbook_treenode_compare_func (GtkCList *clist,
static gint addressbook_list_compare_func (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static void addressbook_folder_load_one_person (GtkCTree *clist,
+ ItemPerson *person,
+ AddressTypeControlItem *atci,
+ AddressTypeControlItem *atciMail);
+static void addressbook_folder_refresh_one_person(GtkCTree *clist,
+ ItemPerson *person);
+static void addressbook_folder_remove_one_person(GtkCTree *clist,
+ ItemPerson *person);
+static void addressbook_folder_remove_node (GtkCTree *clist,
+ GtkCTreeNode *node);
#ifdef USE_LDAP
-static void addressbook_ldap_show_message (SyldapServer *server);
+static void addressbook_ldap_show_message ( LdapServer *server );
#endif
/* LUT's and IF stuff */
static void addressbook_import_ldif_cb ( void );
static void addressbook_import_mutt_cb ( void );
+static void addressbook_import_pine_cb ( void );
+static void addressbook_export_html_cb ( void );
+static void addressbook_export_ldif_cb ( void );
static void addressbook_clip_cut_cb ( void );
static void addressbook_clip_copy_cb ( void );
static void addressbook_clip_paste_cb ( void );
{N_("/_Address/_Edit"), "<alt>Return", addressbook_edit_address_cb, 0, NULL},
{N_("/_Address/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Import _LDIF file"), NULL, addressbook_import_ldif_cb, 0, NULL},
- {N_("/_Tools/Import M_utt file"), NULL, addressbook_import_mutt_cb, 0, NULL},
+ {N_("/_Tools/Import _LDIF file..."), NULL, addressbook_import_ldif_cb, 0, NULL},
+ {N_("/_Tools/Import M_utt file..."), NULL, addressbook_import_mutt_cb, 0, NULL},
+ {N_("/_Tools/Import _Pine file..."), NULL, addressbook_import_pine_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Export _HTML..."), NULL, addressbook_export_html_cb, 0, NULL},
+ {N_("/_Tools/Export LDI_F..."), NULL, addressbook_export_ldif_cb, 0, NULL},
{N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
-/* New options to be added. */
-/*
- {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/Import _Mozilla"), NULL, NULL, 0, NULL},
- {N_("/_Tools/Import _vCard"), NULL, NULL, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Export _LDIF file"), NULL, NULL, 0, NULL},
- {N_("/_Tools/Export v_Card"), NULL, NULL, 0, NULL},
-*/
-
static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
{
{N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL},
{N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL}
};
+/**
+ * Structure of error message table.
+ */
+typedef struct _ErrMsgTableEntry ErrMsgTableEntry;
+struct _ErrMsgTableEntry {
+ gint code;
+ gchar *description;
+};
+
+static gchar *_errMsgUnknown_ = N_( "Unknown" );
+
+/**
+ * Lookup table of error messages for general errors. Note that a NULL
+ * description signifies the end of the table.
+ */
+static ErrMsgTableEntry _lutErrorsGeneral_[] = {
+ { MGU_SUCCESS, N_("Success") },
+ { MGU_BAD_ARGS, N_("Bad arguments") },
+ { MGU_NO_FILE, N_("File not specified") },
+ { MGU_OPEN_FILE, N_("Error opening file") },
+ { MGU_ERROR_READ, N_("Error reading file") },
+ { MGU_EOF, N_("End of file encountered") },
+ { MGU_OO_MEMORY, N_("Error allocating memory") },
+ { MGU_BAD_FORMAT, N_("Bad file format") },
+ { MGU_ERROR_WRITE, N_("Error writing to file") },
+ { MGU_OPEN_DIRECTORY, N_("Error opening directory") },
+ { MGU_NO_PATH, N_("No path specified") },
+ { 0, NULL }
+};
+
+#ifdef USE_LDAP
+/**
+ * Lookup table of error messages for LDAP errors.
+ */
+static ErrMsgTableEntry _lutErrorsLDAP_[] = {
+ { MGU_SUCCESS, N_("Success") },
+ { MGU_LDAP_CONNECT, N_("Error connecting to LDAP server") },
+ { MGU_LDAP_INIT, N_("Error initializing LDAP") },
+ { MGU_LDAP_BIND, N_("Error binding to LDAP server") },
+ { MGU_LDAP_SEARCH, N_("Error searching LDAP database") },
+ { MGU_LDAP_TIMEOUT, N_("Timeout performing LDAP operation") },
+ { MGU_LDAP_CRITERIA, N_("Error in LDAP search criteria") },
+ { MGU_LDAP_CRITERIA, N_("Error in LDAP search criteria") },
+ { MGU_LDAP_NOENTRIES, N_("No LDAP entries found for search criteria") },
+ { 0, NULL }
+};
+#endif
+
+/**
+ * Lookup message for specified error code.
+ * \param lut Lookup table.
+ * \param code Code to lookup.
+ * \return Description associated to code.
+ */
+static gchar *addressbook_err2string( ErrMsgTableEntry lut[], gint code ) {
+ gchar *desc = NULL;
+ ErrMsgTableEntry entry;
+ gint i;
+
+ for( i = 0; ; i++ ) {
+ entry = lut[ i ];
+ if( entry.description == NULL ) break;
+ if( entry.code == code ) {
+ desc = entry.description;
+ break;
+ }
+ }
+ if( ! desc ) {
+ desc = _errMsgUnknown_;
+ }
+ return desc;
+}
+
void addressbook_open(Compose *target)
{
/* Initialize all static members */
addressbook_load_tree();
gtk_ctree_select(GTK_CTREE(addrbook.ctree),
GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
- } else
+ }
+ else {
gtk_widget_hide(addrbook.window);
+ }
gtk_widget_show_all(addrbook.window);
-
addressbook_set_target_compose(target);
}
+void addressbook_destroy() {
+ /* Free up address stuff */
+ if( _addressSelect_ != NULL ) {
+ addrselect_list_free( _addressSelect_ );
+ }
+ if( _clipBoard_ != NULL ) {
+ addrclip_free( _clipBoard_ );
+ }
+ if( _addressIndex_ != NULL ) {
+ addrindex_free_index( _addressIndex_ );
+ addrindex_teardown( _addressIndex_ );
+ }
+ _addressSelect_ = NULL;
+ _clipBoard_ = NULL;
+ _addressIndex_ = NULL;
+}
+
void addressbook_set_target_compose(Compose *target)
{
addrbook.target_compose = target;
-
addressbook_button_set_sensitive();
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
- gtk_widget_set_usize(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
+ gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(window), "addressbook", "Sylpheed");
gtk_widget_realize(window);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(addressbook_close), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(addressbook_close), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
- gtk_widget_set_usize(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
+ gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
/* Address index */
ctree = gtk_ctree_new(1, 0);
gtk_clist_set_compare_func(GTK_CLIST(ctree),
addressbook_treenode_compare_func);
- gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
- GTK_SIGNAL_FUNC(addressbook_tree_selected), NULL);
- gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
- GTK_SIGNAL_FUNC(addressbook_tree_button_pressed),
- NULL);
- gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
- GTK_SIGNAL_FUNC(addressbook_tree_button_released),
- NULL);
+ g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+ G_CALLBACK(addressbook_tree_selected), NULL);
+ g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ G_CALLBACK(addressbook_tree_button_pressed),
+ NULL);
+ g_signal_connect(G_OBJECT(ctree), "button_release_event",
+ G_CALLBACK(addressbook_tree_button_released),
+ NULL);
clist_vbox = gtk_vbox_new(FALSE, 4);
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
GTK_CAN_FOCUS);
- gtk_signal_connect(GTK_OBJECT(clist), "tree_select_row",
- GTK_SIGNAL_FUNC(addressbook_list_row_selected), NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "tree_unselect_row",
- GTK_SIGNAL_FUNC(addressbook_list_row_unselected), NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "button_press_event",
- GTK_SIGNAL_FUNC(addressbook_list_button_pressed),
- NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "button_release_event",
- GTK_SIGNAL_FUNC(addressbook_list_button_released),
- NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "select_row",
- GTK_SIGNAL_FUNC(addressbook_list_selected), NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "tree_expand",
- GTK_SIGNAL_FUNC(addressbook_person_expand_node), NULL );
- gtk_signal_connect(GTK_OBJECT(clist), "tree_collapse",
- GTK_SIGNAL_FUNC(addressbook_person_collapse_node), NULL );
+ g_signal_connect(G_OBJECT(clist), "tree_select_row",
+ G_CALLBACK(addressbook_list_row_selected), NULL);
+ g_signal_connect(G_OBJECT(clist), "tree_unselect_row",
+ G_CALLBACK(addressbook_list_row_unselected), NULL);
+ g_signal_connect(G_OBJECT(clist), "button_press_event",
+ G_CALLBACK(addressbook_list_button_pressed),
+ NULL);
+ g_signal_connect(G_OBJECT(clist), "button_release_event",
+ G_CALLBACK(addressbook_list_button_released),
+ NULL);
+ g_signal_connect(G_OBJECT(clist), "select_row",
+ G_CALLBACK(addressbook_list_selected), NULL);
+ g_signal_connect(G_OBJECT(clist), "tree_expand",
+ G_CALLBACK(addressbook_person_expand_node), NULL );
+ g_signal_connect(G_OBJECT(clist), "tree_collapse",
+ G_CALLBACK(addressbook_person_collapse_node), NULL );
hbox = gtk_hbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(clist_vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
address_completion_register_entry(GTK_ENTRY(entry));
- gtk_signal_connect(GTK_OBJECT(entry), "focus_in_event",
- GTK_SIGNAL_FUNC(addressbook_entry_gotfocus), NULL);
+ g_signal_connect(G_OBJECT(entry), "focus_in_event",
+ G_CALLBACK(addressbook_entry_gotfocus), NULL);
#if 0
- gtk_signal_connect(GTK_OBJECT(entry), "changed",
- GTK_SIGNAL_FUNC(addressbook_entry_changed), NULL);
+ g_signal_connect(G_OBJECT(entry), "changed",
+ G_CALLBACK(addressbook_entry_changed), NULL);
#endif
paned = gtk_hpaned_new();
/* Button panel */
hbbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+ gtk_box_set_spacing(GTK_BOX(hbbox), 2);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
del_btn = gtk_button_new_with_label(_("Delete"));
GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), lup_btn, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_del_clicked), NULL);
- gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_reg_clicked), NULL);
- gtk_signal_connect(GTK_OBJECT(lup_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_lup_clicked), NULL);
+ g_signal_connect(G_OBJECT(del_btn), "clicked",
+ G_CALLBACK(addressbook_del_clicked), NULL);
+ g_signal_connect(G_OBJECT(reg_btn), "clicked",
+ G_CALLBACK(addressbook_reg_clicked), NULL);
+ g_signal_connect(G_OBJECT(lup_btn), "clicked",
+ G_CALLBACK(addressbook_lup_clicked), NULL);
to_btn = gtk_button_new_with_label
(prefs_common.trans_hdr ? _("To:") : "To:");
GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT(to_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_to_clicked),
- GINT_TO_POINTER(COMPOSE_TO));
- gtk_signal_connect(GTK_OBJECT(cc_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_to_clicked),
- GINT_TO_POINTER(COMPOSE_CC));
- gtk_signal_connect(GTK_OBJECT(bcc_btn), "clicked",
- GTK_SIGNAL_FUNC(addressbook_to_clicked),
- GINT_TO_POINTER(COMPOSE_BCC));
+ g_signal_connect(G_OBJECT(to_btn), "clicked",
+ G_CALLBACK(addressbook_to_clicked),
+ GINT_TO_POINTER(COMPOSE_TO));
+ g_signal_connect(G_OBJECT(cc_btn), "clicked",
+ G_CALLBACK(addressbook_to_clicked),
+ GINT_TO_POINTER(COMPOSE_CC));
+ g_signal_connect(G_OBJECT(bcc_btn), "clicked",
+ G_CALLBACK(addressbook_to_clicked),
+ GINT_TO_POINTER(COMPOSE_BCC));
/* Build icons for interface */
stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
n_entries,
"<AddressBookTree>", &tree_factory,
NULL);
- gtk_signal_connect(GTK_OBJECT(tree_popup), "selection_done",
- GTK_SIGNAL_FUNC(addressbook_popup_close), NULL);
+ g_signal_connect(G_OBJECT(tree_popup), "selection_done",
+ G_CALLBACK(addressbook_popup_close), NULL);
n_entries = sizeof(addressbook_list_popup_entries) /
sizeof(addressbook_list_popup_entries[0]);
list_popup = menu_create_items(addressbook_list_popup_entries,
addrbook.listSelected = NULL;
address_completion_start(window);
gtk_widget_show_all(window);
+ gtk_widget_set_sensitive(addrbook.lup_btn, FALSE);
}
-static gint addressbook_close(void)
-{
+static gint addressbook_close( void ) {
gtk_widget_hide(addrbook.window);
addressbook_export_to_file();
return TRUE;
gchar *name;
name = addrindex_ds_get_name( ds );
- sprintf( addressbook_msgbuf, "%s: %s", name, msg );
+ g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
+ "%s: %s", name, msg );
}
else {
- sprintf( addressbook_msgbuf, "%s", msg );
+ g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
+ "%s", msg );
}
addressbook_status_show( addressbook_msgbuf );
}
static void addressbook_ds_show_message( AddressDataSource *ds ) {
gint retVal;
gchar *name;
+ gchar *desc;
*addressbook_msgbuf = '\0';
if( ds ) {
name = addrindex_ds_get_name( ds );
retVal = addrindex_ds_get_status_code( ds );
if( retVal == MGU_SUCCESS ) {
- sprintf( addressbook_msgbuf, "%s", name );
+ g_snprintf( addressbook_msgbuf,
+ sizeof(addressbook_msgbuf), "%s", name );
}
else {
- sprintf( addressbook_msgbuf, "%s: %s", name,
- mgu_error2string( retVal ) );
+ desc = addressbook_err2string( _lutErrorsGeneral_, retVal );
+ g_snprintf( addressbook_msgbuf,
+ sizeof(addressbook_msgbuf), "%s: %s", name, desc );
}
}
addressbook_status_show( addressbook_msgbuf );
AddrItemObject *aio;
AddrSelectItem *item;
GList *list, *node;
-
+ gboolean refreshList = FALSE;
+
pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
g_return_if_fail(pobj != NULL);
/* Test for read only */
iface = ds->interface;
if( iface->readOnly ) {
- aval = alertpanel( _("Delete address(es)"),
+ alertpanel( _("Delete address(es)"),
_("This address data is readonly and cannot be deleted."),
_("Close"), NULL, NULL );
return;
}
/* Remove group from parent node */
gtk_ctree_remove_node( ctree, nd );
+ refreshList = TRUE;
}
else if( aio->type == ADDR_ITEM_PERSON ) {
ItemPerson *item = ( ItemPerson * ) aio;
+ addressbook_folder_remove_one_person( clist, item );
item = addrbook_remove_person( abf, item );
if( item ) {
addritem_free_item_person( item );
if( item ) {
addritem_free_item_email( item );
}
+ addressbook_folder_refresh_one_person( clist, person );
}
}
g_list_free( list );
addressbook_list_select_clear();
- gtk_ctree_select( ctree, addrbook.opened);
+ if( refreshList ) gtk_ctree_select( ctree, addrbook.opened);
return;
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
Compose *compose;
AddrSelectItem *item;
AddrItemObject *aio;
- gchar *addr;
+ const gchar *addr;
+ gchar *tmpaddr;
compose = addrbook.target_compose;
if( ! compose ) return;
+ /* Nothing selected, but maybe there is something in text entry */
+ addr = gtk_entry_get_text( GTK_ENTRY( addrbook.entry) );
+ if ( addr ) {
+ compose_entry_append(
+ compose, addr, (ComposeEntryType)data );
+ }
+
+ /* Select from address list */
list = addrselect_get_list( _addressSelect_ );
node = list;
while( node ) {
aio = item->addressItem;
if( aio->type == ADDR_ITEM_PERSON ||
aio->type == ADDR_ITEM_EMAIL ) {
- addr = addressbook_format_address( aio );
+ tmpaddr = addressbook_format_address( aio );
compose_entry_append(
- compose, addr, (ComposeEntryType) data );
- g_free( addr );
+ compose, tmpaddr, (ComposeEntryType) data );
+ g_free( tmpaddr );
}
else if( aio->type == ADDR_ITEM_GROUP ) {
ItemGroup *group = ( ItemGroup * ) aio;
while( nodeMail ) {
ItemEMail *email = nodeMail->data;
- addr = addressbook_format_address(
+ tmpaddr = addressbook_format_address(
( AddrItemObject * ) email );
compose_entry_append(
- compose, addr, (ComposeEntryType) data );
- g_free( addr );
+ compose, tmpaddr, (ComposeEntryType) data );
+ g_free( tmpaddr );
nodeMail = g_list_next( nodeMail );
}
}
gboolean canAdd = FALSE;
gboolean canEditTr = TRUE;
gboolean editAddress = FALSE;
+ gboolean canExport = TRUE;
AddressTypeControlItem *atci = NULL;
AddressDataSource *ds = NULL;
AddressInterface *iface = NULL;
menu_set_sensitive( addrbook.menu_factory, atci->menuCommand, TRUE );
}
}
- canEditTr = FALSE;
+ canEditTr = canExport = FALSE;
}
else if( obj->type == ADDR_DATASOURCE ) {
AdapterDSource *ads = ADAPTER_DSOURCE(obj);
canAdd = canEdit = editAddress = TRUE;
}
if( ! iface->haveLibrary ) {
- canAdd = canEdit = editAddress = FALSE;
+ canAdd = canEdit = editAddress = canExport = FALSE;
}
}
else if( obj->type == ADDR_ITEM_FOLDER ) {
menu_set_sensitive( addrbook.menu_factory, "/File/Edit", canEditTr );
menu_set_sensitive( addrbook.menu_factory, "/File/Delete", canEditTr );
+
+ /* Export data */
+ menu_set_sensitive( addrbook.menu_factory, "/Tools/Export HTML...", canExport );
+ menu_set_sensitive( addrbook.menu_factory, "/Tools/Export LDIF...", canExport );
}
+/**
+ * Address book tree callback function that responds to selection of tree
+ * items.
+ *
+ * \param ctree Tree widget.
+ * \param node Node that was selected.
+ * \param column Column number where selected occurred.
+ * \param data Pointer to user data.
+ */
static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
gint column, gpointer data)
{
AdapterDSource *ads = NULL;
AddressDataSource *ds = NULL;
ItemFolder *rootFolder = NULL;
+ AddressObjectType aot;
addrbook.treeSelected = node;
addrbook.listSelected = NULL;
/* Load folders into the tree */
rootFolder = addrindex_ds_get_root_folder( ds );
if( ds->type == ADDR_IF_JPILOT ) {
- addressbook_node_add_folder( node, ds, rootFolder, ADDR_CATEGORY );
+ aot = ADDR_CATEGORY;
+ }
+ else if( ds->type == ADDR_IF_LDAP ) {
+ aot = ADDR_LDAP_QUERY;
}
else {
- addressbook_node_add_folder( node, ds, rootFolder, ADDR_ITEM_FOLDER );
+ aot = ADDR_ITEM_FOLDER;
}
+ addressbook_node_add_folder( node, ds, rootFolder, aot );
addrindex_ds_set_access_flag( ds, &tVal );
gtk_ctree_expand( ctree, node );
}
addressbook_menuitem_set_sensitive( obj, node );
addressbook_list_select_clear();
-
}
/*
gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
}
-static void addressbook_list_button_pressed(GtkWidget *widget,
- GdkEventButton *event,
- gpointer data)
+static gboolean addressbook_list_button_pressed(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data)
{
- if( ! event ) return;
+ if( ! event ) return FALSE;
addressbook_list_menu_setup();
gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
event->button, event->time );
}
+ return FALSE;
}
-static void addressbook_list_button_released(GtkWidget *widget,
- GdkEventButton *event,
- gpointer data)
+static gboolean addressbook_list_button_released(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data)
{
}
-static void addressbook_tree_button_pressed(GtkWidget *ctree,
- GdkEventButton *event,
- gpointer data)
+static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
+ GdkEventButton *event,
+ gpointer data)
{
GtkCList *clist = GTK_CLIST(ctree);
gint row, column;
gboolean canTreeCut = FALSE;
gboolean canTreeCopy = FALSE;
gboolean canTreePaste = FALSE;
+ gboolean canLookup = FALSE;
- if( ! event ) return;
+ if( ! event ) return FALSE;
addressbook_menubar_set_sensitive( FALSE );
if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
}
menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
+ gtk_widget_set_sensitive( addrbook.lup_btn, FALSE );
- if( obj == NULL ) return;
+ if( obj == NULL ) return FALSE;
if( ! addrclip_is_empty( _clipBoard_ ) ) {
canTreePaste = TRUE;
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
canTreeCopy = TRUE;
+ if( iface->externalQuery ) canLookup = TRUE;
}
else if (obj->type == ADDR_ITEM_FOLDER) {
ds = addressbook_find_datasource( addrbook.treeSelected );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
canTreeCopy = TRUE;
+ iface = ds->interface;
+ if( iface->externalQuery ) canLookup = TRUE;
}
else if (obj->type == ADDR_ITEM_GROUP) {
ds = addressbook_find_datasource( addrbook.treeSelected );
menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste", canPaste );
menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );
+ gtk_widget_set_sensitive( addrbook.lup_btn, canLookup );
+
if( event->button == 3 ) {
gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
event->button, event->time);
}
+ return FALSE;
}
-static void addressbook_tree_button_released(GtkWidget *ctree,
- GdkEventButton *event,
- gpointer data)
+static gboolean addressbook_tree_button_released(GtkWidget *ctree,
+ GdkEventButton *event,
+ gpointer data)
{
gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
+ return FALSE;
}
static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
if( ! iface->haveLibrary ) return NULL;
/* Read data from data source */
+ if( addrindex_ds_get_modify_flag( ds ) ) {
+ addrindex_ds_read_data( ds );
+ }
+
if( ! addrindex_ds_get_read_flag( ds ) ) {
addrindex_ds_read_data( ds );
}
if( name && parentNode ) {
/* Update node in tree view */
addressbook_change_node_name( node, name );
- gtk_ctree_sort_node(ctree, parentNode);
+ gtk_sctree_sort_node(ctree, parentNode);
gtk_ctree_expand( ctree, node );
gtk_ctree_select( ctree, node );
}
if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
/* New address */
ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
- if( person ) {
- if( addrbook.treeSelected == addrbook.opened ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
- }
+ if( person && addrbook.treeSelected == addrbook.opened ) {
+ gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+ addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
}
}
}
return NULL;
}
-/*
-* Search for specified child folder node in address index tree.
-* Enter: parent Parent node.
-* folder Folder to find.
-*/
-static GtkCTreeNode *addressbook_find_folder_node( GtkCTreeNode *parent, ItemFolder *folder ) {
- GtkCTreeNode *node = NULL;
- GtkCTreeRow *currRow;
-
- currRow = GTK_CTREE_ROW( parent );
- if( currRow ) {
- node = currRow->children;
- while( node ) {
- AddressObject *obj;
-
- obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
- if( obj->type == ADDR_ITEM_FOLDER ) {
- ItemFolder *f = ADAPTER_FOLDER(obj)->itemFolder;
- if( f == folder ) return node;
- }
- currRow = GTK_CTREE_ROW(node);
- node = currRow->sibling;
- }
- }
- return NULL;
-}
-
static AddressBookFile *addressbook_get_book_file() {
AddressBookFile *abf = NULL;
AddressDataSource *ds = NULL;
while( (child = currRow->children) ) {
gtk_ctree_move( ctree, child, parent, node );
}
- gtk_ctree_sort_node( ctree, parent );
+ gtk_sctree_sort_node( ctree, parent );
}
}
ItemPerson *person;
person = ( ItemPerson * ) ADDRITEM_PARENT(email);
if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
- gtk_ctree_select( ctree, addrbook.opened );
+ addressbook_folder_refresh_one_person( clist, person );
invalidate_address_completion();
return;
}
/* Edit person - basic page */
ItemPerson *person = ( ItemPerson * ) obj;
if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
- gtk_ctree_select( ctree, addrbook.opened);
invalidate_address_completion();
+ addressbook_folder_refresh_one_person( clist, person );
return;
}
else if( obj->type == ADDR_ITEM_GROUP ) {
/* Update tree node with node name */
if( node == NULL ) return;
addressbook_change_node_name( node, name );
- gtk_ctree_sort_node( ctree, parentNode );
- gtk_ctree_select( ctree, addrbook.opened );
+ gtk_sctree_sort_node( ctree, parentNode );
+ gtk_ctree_select( ctree, addrbook.opened );
}
static void addressbook_delete_address_cb(gpointer data, guint action,
}
}
-static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
- GList *items;
- AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
- AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
-
- if( atci == NULL ) return;
- if( atciMail == NULL ) return;
-
- /* Load email addresses */
- items = addritem_folder_get_person_list( itemFolder );
- for( ; items != NULL; items = g_list_next( items ) ) {
- GtkCTreeNode *nodePerson = NULL;
- GtkCTreeNode *nodeEMail = NULL;
- gchar *text[N_COLS];
- gboolean flgFirst = TRUE, haveAddr = FALSE;
- ItemPerson *person;
- GList *node;
+static void addressbook_folder_load_one_person(
+ GtkCTree *clist, ItemPerson *person,
+ AddressTypeControlItem *atci,
+ AddressTypeControlItem *atciMail )
+{
+ GtkCTreeNode *nodePerson = NULL;
+ GtkCTreeNode *nodeEMail = NULL;
+ gchar *text[N_COLS];
+ gboolean flgFirst = TRUE, haveAddr = FALSE;
+ GList *node;
- person = ( ItemPerson * ) items->data;
- if( person == NULL ) continue;
+ if( person == NULL ) return;
- text[COL_NAME] = NULL;
- node = person->listEMail;
- while( node ) {
- ItemEMail *email = node->data;
- gchar *eMailAddr = NULL;
- node = g_list_next( node );
+ text[COL_NAME] = NULL;
+ node = person->listEMail;
+ while( node ) {
+ ItemEMail *email = node->data;
+ gchar *eMailAddr = NULL;
+ node = g_list_next( node );
- text[COL_ADDRESS] = email->address;
- text[COL_REMARKS] = email->remarks;
- eMailAddr = ADDRITEM_NAME(email);
- if( eMailAddr && *eMailAddr == '\0' ) eMailAddr = NULL;
- if( flgFirst ) {
- /* First email belongs with person */
- gchar *str = addressbook_format_item_clist( person, email );
- if( str ) {
- text[COL_NAME] = str;
- }
- else {
- text[COL_NAME] = ADDRITEM_NAME(person);
- }
- nodePerson = gtk_ctree_insert_node(
- clist, NULL, NULL,
- text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
- FALSE, person->isOpened );
- g_free( str );
- str = NULL;
- gtk_ctree_node_set_row_data(clist, nodePerson, person );
+ text[COL_ADDRESS] = email->address;
+ text[COL_REMARKS] = email->remarks;
+ eMailAddr = ADDRITEM_NAME(email);
+ if( eMailAddr && *eMailAddr == '\0' ) eMailAddr = NULL;
+ if( flgFirst ) {
+ /* First email belongs with person */
+ gchar *str = addressbook_format_item_clist( person, email );
+ if( str ) {
+ text[COL_NAME] = str;
}
else {
- /* Subsequent email is a child node of person */
- text[COL_NAME] = ADDRITEM_NAME(email);
- nodeEMail = gtk_ctree_insert_node(
- clist, nodePerson, NULL,
- text, FOLDER_SPACING,
- atciMail->iconXpm, atciMail->maskXpm,
- atciMail->iconXpmOpen, atciMail->maskXpmOpen,
- FALSE, TRUE );
- gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+ text[COL_NAME] = ADDRITEM_NAME(person);
}
- flgFirst = FALSE;
- haveAddr = TRUE;
- }
- if( ! haveAddr ) {
- /* Have name without EMail */
- text[COL_NAME] = ADDRITEM_NAME(person);
- text[COL_ADDRESS] = NULL;
- text[COL_REMARKS] = NULL;
nodePerson = gtk_ctree_insert_node(
clist, NULL, NULL,
text, FOLDER_SPACING,
atci->iconXpm, atci->maskXpm,
atci->iconXpmOpen, atci->maskXpmOpen,
FALSE, person->isOpened );
+ g_free( str );
+ str = NULL;
gtk_ctree_node_set_row_data(clist, nodePerson, person );
}
- gtk_ctree_sort_node(GTK_CTREE(clist), NULL);
+ else {
+ /* Subsequent email is a child node of person */
+ text[COL_NAME] = ADDRITEM_NAME(email);
+ nodeEMail = gtk_ctree_insert_node(
+ clist, nodePerson, NULL,
+ text, FOLDER_SPACING,
+ atciMail->iconXpm, atciMail->maskXpm,
+ atciMail->iconXpmOpen, atciMail->maskXpmOpen,
+ FALSE, TRUE );
+ gtk_ctree_node_set_row_data(clist, nodeEMail, email );
+ }
+ flgFirst = FALSE;
+ haveAddr = TRUE;
+ }
+ if( ! haveAddr ) {
+ /* Have name without EMail */
+ text[COL_NAME] = ADDRITEM_NAME(person);
+ text[COL_ADDRESS] = NULL;
+ text[COL_REMARKS] = NULL;
+ nodePerson = gtk_ctree_insert_node(
+ clist, NULL, NULL,
+ text, FOLDER_SPACING,
+ atci->iconXpm, atci->maskXpm,
+ atci->iconXpmOpen, atci->maskXpmOpen,
+ FALSE, person->isOpened );
+ gtk_ctree_node_set_row_data(clist, nodePerson, person );
+ }
+ gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+ return;
+}
+
+static void addressbook_folder_load_person( GtkCTree *clist, ItemFolder *itemFolder ) {
+ GList *items;
+ AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+ AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+
+ if( atci == NULL ) return;
+ if( atciMail == NULL ) return;
+
+ /* 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 );
}
/* Free up the list */
mgu_clear_list( items );
g_list_free( items );
}
+static void addressbook_folder_remove_node( GtkCTree *clist, GtkCTreeNode *node ) {
+ addrbook.listSelected = NULL;
+ gtk_ctree_remove_node( clist, node );
+ addressbook_menubar_set_sensitive( FALSE );
+ addressbook_menuitem_set_sensitive(
+ gtk_ctree_node_get_row_data(
+ GTK_CTREE(clist), addrbook.treeSelected ),
+ addrbook.treeSelected );
+}
+
+static void addressbook_folder_refresh_one_person( GtkCTree *clist, ItemPerson *person ) {
+ AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_PERSON );
+ AddressTypeControlItem *atciMail = addrbookctl_lookup( ADDR_ITEM_EMAIL );
+ GtkCTreeNode *node;
+ if( atci == NULL ) return;
+ if( atciMail == NULL ) return;
+ if( person == NULL ) return;
+ /* unload the person */
+
+ node = gtk_ctree_find_by_row_data( clist, NULL, person );
+ if( node )
+ addressbook_folder_remove_node( clist, node );
+ addressbook_folder_load_one_person( clist, person, atci, atciMail );
+ node = gtk_ctree_find_by_row_data( clist, NULL, person );
+ if( node ) {
+ gtk_ctree_select( clist, node );
+ if (!gtk_ctree_node_is_visible( clist, node ) )
+ gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
+ }
+}
+
+static void addressbook_folder_remove_one_person( GtkCTree *clist, ItemPerson *person ) {
+ GtkCTreeNode *node;
+ gint row;
+
+ if( person == NULL ) return;
+ node = gtk_ctree_find_by_row_data( clist, NULL, person );
+ row = gtk_clist_find_row_from_data( GTK_CLIST(clist), person );
+ if( node ) {
+ addressbook_folder_remove_node( clist, node );
+ }
+}
+
static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFolder ) {
GList *items;
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_GROUP );
atci->iconXpmOpen, atci->maskXpmOpen,
FALSE, FALSE);
gtk_ctree_node_set_row_data(clist, nodeGroup, group );
- gtk_ctree_sort_node(clist, NULL);
+ gtk_sctree_sort_node(clist, NULL);
}
/* Free up the list */
mgu_clear_list( items );
g_list_free( items );
}
-/*
- * Load data sources into list.
- */
-static void addressbook_node_load_datasource( GtkCTree *clist, AddressObject *obj ) {
- AdapterInterface *adapter;
- AddressInterface *iface;
- AddressTypeControlItem *atci = NULL;
- GtkCTreeNode *newNode, *node;
- GtkCTreeRow *row;
- GtkCell *cell = NULL;
- gchar *text[N_COLS];
-
- adapter = ADAPTER_INTERFACE(obj);
- if( adapter == NULL ) return;
- iface = adapter->interface;
- atci = adapter->atci;
- if( atci == NULL ) return;
-
- /* Create nodes in list copying values for data sources in tree */
- row = GTK_CTREE_ROW( adapter->treeNode );
- if( row ) {
- node = row->children;
- while( node ) {
- gpointer data;
-
- data = gtk_ctree_node_get_row_data( clist, node );
- row = GTK_CTREE_ROW( node );
- cell = ( ( GtkCListRow * )row )->cell;
- text[COL_NAME] = cell->u.text;
- text[COL_ADDRESS] = NULL;
- text[COL_REMARKS] = NULL;
- newNode = gtk_ctree_insert_node( clist, NULL, NULL,
- text, FOLDER_SPACING,
- atci->iconXpm, atci->maskXpm,
- atci->iconXpmOpen, atci->maskXpmOpen,
- FALSE, FALSE);
- /*
- gtk_ctree_node_set_row_data( clist, newNode, data );
- gtk_ctree_node_set_row_data_full( clist, newNode, NULL, NULL );
- */
- node = row->sibling;
- }
- }
- gtk_ctree_sort_node( clist, NULL );
-}
-
/*
* Search ctree widget callback function.
* Enter: pA Pointer to node.
/* Load root folder */
ItemFolder *rootFolder = NULL;
rootFolder = addrindex_ds_get_root_folder( ds );
- addressbook_folder_load_person( ctreelist, addrindex_ds_get_root_folder( ds ) );
- addressbook_folder_load_group( ctreelist, addrindex_ds_get_root_folder( ds ) );
+ addressbook_folder_load_person(
+ ctreelist, addrindex_ds_get_root_folder( ds ) );
+ addressbook_folder_load_group(
+ ctreelist, addrindex_ds_get_root_folder( ds ) );
}
}
else {
}
void addressbook_ads_set_name( AdapterDSource *adapter, gchar *value ) {
- ADDRESS_OBJECT_NAME(adapter) = mgu_replace_string( ADDRESS_OBJECT_NAME(adapter), value );
+ ADDRESS_OBJECT_NAME(adapter) =
+ mgu_replace_string( ADDRESS_OBJECT_NAME(adapter), value );
}
/*
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) );
+ ads = addressbook_create_ds_adapter(
+ ds, atci->objectType, name );
+ newNode = addressbook_add_object(
+ node, ADDRESS_OBJECT(ads) );
nodeDS = g_list_next( nodeDS );
}
gtk_ctree_expand( ctree, node );
}
addrIndex = addrindex_create_index();
+ addrindex_initialize( addrIndex );
/* Use new address book index. */
addrindex_set_file_path( addrIndex, get_rc_dir() );
}
}
- gtk_ctree_sort_node(ctree, node);
+ gtk_sctree_sort_node(ctree, node);
return added;
}
* itemGroup Group to add.
* Return: Inserted node.
*/
-static GtkCTreeNode *addressbook_node_add_group( GtkCTreeNode *node, AddressDataSource *ds, ItemGroup *itemGroup ) {
+static GtkCTreeNode *addressbook_node_add_group(
+ GtkCTreeNode *node, AddressDataSource *ds,
+ ItemGroup *itemGroup )
+{
GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
GtkCTreeNode *newNode;
AdapterGroup *adapter;
atci->treeLeaf, atci->treeExpand );
gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
addressbook_free_treenode );
- gtk_ctree_sort_node( ctree, node );
+ gtk_sctree_sort_node( ctree, node );
return newNode;
}
-/*
-* Add folder into the address index tree.
-* Enter: node Parent node.
-* ds Data source.
-* itemFolder Folder to add.
-* otype Object type to display.
-* Return: Inserted node.
+/**
+ * Add folder into the address index tree. Only visible folders are loaded into
+ * the address index tree. Note that the root folder is not inserted into the
+ * tree.
+ *
+ * \param node Parent node.
+ * \param ds Data source.
+ * \param itemFolder Folder to add.
+ * \param otype Object type to display.
+ * \return Inserted node for the folder.
*/
static GtkCTreeNode *addressbook_node_add_folder(
- GtkCTreeNode *node, AddressDataSource *ds, ItemFolder *itemFolder, AddressObjectType otype )
+ GtkCTreeNode *node, AddressDataSource *ds,
+ ItemFolder *itemFolder, AddressObjectType otype )
{
GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
GtkCTreeNode *newNode = NULL;
AdapterFolder *adapter;
AddressTypeControlItem *atci = NULL;
GList *listItems = NULL;
- gchar **name;
+ gchar *name;
ItemFolder *rootFolder;
+ /* Only visible folders */
+ if( itemFolder->isHidden ) return NULL;
+
if( ds == NULL ) return NULL;
if( node == NULL || itemFolder == NULL ) return NULL;
newNode = node;
}
else {
- name = &itemFolder->obj.name;
-
adapter = g_new0( AdapterFolder, 1 );
ADDRESS_OBJECT_TYPE(adapter) = ADDR_ITEM_FOLDER;
ADDRESS_OBJECT_NAME(adapter) = g_strdup( ADDRITEM_NAME(itemFolder) );
adapter->itemFolder = itemFolder;
- newNode = gtk_ctree_insert_node( ctree, node, NULL, name, FOLDER_SPACING,
+ name = ADDRITEM_NAME(itemFolder);
+ newNode = gtk_ctree_insert_node( ctree, node, NULL, &name, FOLDER_SPACING,
atci->iconXpm, atci->maskXpm, atci->iconXpm, atci->maskXpm,
atci->treeLeaf, atci->treeExpand );
- gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
- addressbook_free_treenode );
+ if( newNode ) {
+ gtk_ctree_node_set_row_data_full( ctree, newNode, adapter,
+ addressbook_free_treenode );
+ }
}
listItems = itemFolder->listFolder;
addressbook_node_add_group( newNode, ds, item );
listItems = g_list_next( listItems );
}
- gtk_ctree_sort_node( ctree, node );
+ gtk_sctree_sort_node( ctree, node );
return newNode;
}
-static void addressbook_delete_object(AddressObject *obj) {
- AdapterDSource *ads = NULL;
- AddressDataSource *ds = NULL;
- if (!obj) return;
-
- /* Remove data source. */
- /* printf( "Delete obj type : %d\n", obj->type ); */
-
- ads = ADAPTER_DSOURCE(obj);
- if( ads == NULL ) return;
- ds = ads->dataSource;
- if( ds == NULL ) return;
-
- /* Remove data source */
- if( addrindex_index_remove_datasource( _addressIndex_, ds ) ) {
- addrindex_free_datasource( ds );
- }
- /* Free up Adapter object */
- g_free( ads );
-}
-
void addressbook_export_to_file( void ) {
if( _addressIndex_ ) {
/* Save all new address book data */
}
}
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
addressbook_close();
+ return FALSE;
}
/*
}
}
}
+#endif
-static void addressbook_ldap_show_message( SyldapServer *svr ) {
- gchar *name;
+/**
+ * Display address search status message.
+ * \param queryType Query type.
+ * \param status Status/Error code.
+ */
+static void addressbook_search_message( AddrQueryType queryType, gint sts ) {
+ gchar *desc = NULL;
*addressbook_msgbuf = '\0';
- if( svr ) {
- name = syldap_get_name( svr );
- if( svr->busyFlag ) {
- sprintf( addressbook_msgbuf, "%s: %s", name, ADDRESSBOOK_LDAP_BUSYMSG );
+
+ if( sts != MGU_SUCCESS ) {
+ if( queryType == ADDRQUERY_LDAP ) {
+#ifdef USE_LDAP
+ desc = addressbook_err2string( _lutErrorsLDAP_, sts );
+#endif
}
else {
- if( svr->retVal == MGU_SUCCESS ) {
- sprintf( addressbook_msgbuf, "%s", name );
- }
- else {
- sprintf( addressbook_msgbuf, "%s: %s", name, mgu_error2string( svr->retVal ) );
- }
+ desc = NULL;
}
+ g_snprintf( addressbook_msgbuf,
+ sizeof(addressbook_msgbuf), "%s", desc );
}
addressbook_status_show( addressbook_msgbuf );
}
-static void ldapsearch_callback( SyldapServer *sls ) {
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+/**
+ * Refresh addressbook by forcing refresh of current selected object in
+ * tree.
+ */
+static void addressbook_refresh_current( void ) {
AddressObject *obj;
- AdapterDSource *ads = NULL;
- AddressDataSource *ds = NULL;
- AddressInterface *iface = NULL;
-
- if( sls == NULL ) return;
- if( ! addrbook.treeSelected ) return;
- if( GTK_CTREE_ROW( addrbook.treeSelected )->level == 1 ) return;
+ GtkCTree *ctree;
+ ctree = GTK_CTREE(addrbook.ctree);
obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
if( obj == NULL ) return;
- if( obj->type == ADDR_DATASOURCE ) {
- ads = ADAPTER_DSOURCE(obj);
- if( ads->subType == ADDR_LDAP ) {
- SyldapServer *server;
+ addressbook_set_clist( obj );
+}
- ds = ads->dataSource;
- if( ds == NULL ) return;
- iface = ds->interface;
- if( ! iface->haveLibrary ) return;
- server = ds->rawDataSource;
- if( server == sls ) {
- /* Read from cache */
- gtk_widget_show_all(addrbook.window);
- addressbook_set_clist( obj );
- addressbook_ldap_show_message( sls );
- gtk_widget_show_all(addrbook.window);
- gtk_entry_set_text( GTK_ENTRY(addrbook.entry), "" );
- }
- }
+static gchar *_tempMessage_ = N_("Busy searching...");
+
+/**
+ * Address search idle function. This function is called during UI idle time
+ * while a search is in progress.
+ *
+ * \param data Idler data.
+ */
+static void addressbook_search_idle( gpointer data ) {
+ /*
+ gint queryID;
+
+ queryID = GPOINTER_TO_INT( data );
+ printf( "addressbook_ldap_idle... queryID=%d\n", queryID );
+ */
+}
+
+/**
+ * Search completion function. This removes the query from the idle list.
+ *
+ * \param queryID Query to be removed.
+ * \param queryType Query type being removed.
+ * \param status Search status.
+ */
+static void addressbook_search_idle_end(
+ gint queryID, AddrQueryType queryType, gint status )
+{
+ gpointer data;
+
+ data = GINT_TO_POINTER( queryID );
+ if( data ) {
+ gtk_idle_remove_by_data( data );
}
+ addressbook_refresh_current();
+ addressbook_search_message( queryType, status );
}
-#endif
-/*
- * Lookup button handler.
+/**
+ * Perform search.
+ *
+ * \param ds Data source to search.
+ * \param searchTerm String to lookup.
+ * \param pNode Parent data source node.
*/
-static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
- GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
- AddressObject *obj;
+static void addressbook_perform_search(
+ AddressDataSource *ds, gchar *searchTerm,
+ GtkCTreeNode *pNode )
+{
+ AddressBookFile *abf;
+ ItemFolder *folder;
+ GtkCTree *ctree;
+ GtkCTreeNode *nNode;
+ gchar *name;
+ gint queryID;
+ guint idleID;
+ AddressObjectType aoType;
+
+ if( ds->type == ADDR_IF_LDAP ) {
#ifdef USE_LDAP
- AdapterDSource *ads = NULL;
- AddressDataSource *ds = NULL;
- AddressInterface *iface = NULL;
+ aoType = ADDR_LDAP_QUERY;
#endif
- gchar *sLookup;
+ }
+ else {
+ return;
+ }
+ abf = ds->rawDataSource;
- sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
- g_strchomp( sLookup );
+ /* Setup a query */
+ if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
- if( ! addrbook.treeSelected ) return;
- if( GTK_CTREE_ROW( addrbook.treeSelected )->level == 1 ) return;
- obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+ /* Create a folder for the search results */
+ folder = addrbook_add_new_folder( abf, NULL );
+ name = g_strdup_printf( "Search '%s'", searchTerm );
+ addritem_folder_set_name( folder, name );
+ addritem_folder_set_remarks( folder, "" );
+ 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_ctree_select( ctree, nNode );
+ addrbook.treeSelected = nNode;
+ }
+
+ /* Setup the search */
+ queryID = addrindex_setup_static_search(
+ ds, searchTerm, folder, addressbook_search_idle_end );
+ if( queryID == 0 ) return;
+
+ /* Set up idler function */
+ idleID = gtk_idle_add(
+ ( GtkFunction ) addressbook_search_idle,
+ GINT_TO_POINTER( queryID ) );
+
+ /* Start search, sit back and wait for something to happen */
+ addrindex_start_static_search( queryID, idleID );
+
+ addressbook_status_show( _tempMessage_ );
+}
+
+/**
+ * Lookup button handler. Address search is only performed against
+ * address interfaces for external queries.
+ *
+ * \param button Lookup button widget.
+ * \param data Data object.
+ */
+static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
+ GtkCTree *ctree;
+ AddressObject *obj;
+ AddressDataSource *ds;
+ AddressInterface *iface;
+ gchar *searchTerm;
+ GtkCTreeNode *node, *parentNode;
+
+ node = addrbook.treeSelected;
+ if( ! node ) return;
+ if( GTK_CTREE_ROW(node)->level == 1 ) return;
+
+ ctree = GTK_CTREE(addrbook.ctree);
+ obj = gtk_ctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
-#ifdef USE_LDAP
- if( obj->type == ADDR_DATASOURCE ) {
- ads = ADAPTER_DSOURCE(obj);
- if( ads->subType == ADDR_LDAP ) {
- SyldapServer *server;
+ ds = addressbook_find_datasource( node );
+ if( ds == NULL ) return;
- ds = ads->dataSource;
- if( ds == NULL ) return;
- iface = ds->interface;
- if( ! iface->haveLibrary ) return;
- server = ds->rawDataSource;
- if( server ) {
- syldap_cancel_read( server );
- if( *sLookup == '\0' || strlen( sLookup ) < 1 ) return;
- syldap_set_search_value( server, sLookup );
- syldap_set_callback( server, ldapsearch_callback );
- syldap_read_data_th( server );
- addressbook_ldap_show_message( server );
- }
- }
+ /* We must have a datasource that is an external interface */
+ iface = ds->interface;
+ if( ! iface->haveLibrary ) return;
+ if( ! iface->externalQuery ) return;
+
+ searchTerm =
+ gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
+ g_strchomp( searchTerm );
+
+ if( obj->type == ADDR_ITEM_FOLDER ) {
+ parentNode = GTK_CTREE_ROW(node)->parent;
}
-#endif
+ else {
+ parentNode = node;
+ }
+ addressbook_perform_search( ds, searchTerm, parentNode );
+ g_free( searchTerm );
}
/* **********************************************************************
ItemObjectType addressbook_type2item( AddressObjectType abType ) {
ItemObjectType ioType;
- ioType = ITEMTYPE_NONE;
switch( abType ) {
case ADDR_ITEM_PERSON: ioType = ITEMTYPE_PERSON; break;
case ADDR_ITEM_EMAIL: ioType = ITEMTYPE_EMAIL; break;
case ADDR_ITEM_FOLDER: ioType = ITEMTYPE_FOLDER; break;
case ADDR_ITEM_GROUP: ioType = ITEMTYPE_GROUP; break;
case ADDR_DATASOURCE: ioType = ITEMTYPE_DATASOURCE; break;
+ default: ioType = ITEMTYPE_NONE; break;
}
return ioType;
}
stock_pixmap_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm, &jpilotxpmmask);
stock_pixmap_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm, &categoryxpmmask);
stock_pixmap_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm, &ldapxpmmask);
+ stock_pixmap_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm, &addrsearchxpmmask);
_addressBookTypeHash_ = g_hash_table_new( g_int_hash, g_int_equal );
_addressBookTypeList_ = NULL;
atci->interfaceType = ADDR_IF_LDAP;
atci->showInTree = TRUE;
atci->treeExpand = TRUE;
- atci->treeLeaf = TRUE;
+ atci->treeLeaf = FALSE;
atci->displayName = _( "LDAP Server" );
atci->iconXpm = ldapxpm;
atci->maskXpm = ldapxpmmask;
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+ /* LDAP Query */
+ atci = g_new0( AddressTypeControlItem, 1 );
+ atci->objectType = ADDR_LDAP_QUERY;
+ atci->interfaceType = ADDR_IF_LDAP;
+ atci->showInTree = TRUE;
+ atci->treeExpand = FALSE;
+ atci->treeLeaf = TRUE;
+ atci->displayName = _( "LDAP Query" );
+ atci->iconXpm = addrsearchxpm;
+ atci->maskXpm = addrsearchxpmmask;
+ atci->iconXpmOpen = addrsearchxpm;
+ atci->maskXpmOpen = addrsearchxpmmask;
+ atci->menuCommand = NULL;
+ g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
+ _addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
+
}
/*
gchar *endptr = NULL;
gboolean enabled;
AdapterInterface *adapter;
- /* GList *node; */
selectStr = g_strdup( ADDRESSBOOK_IFACE_SELECTION );
g_list_free( _addressIFaceSelection_ );
_addressIFaceSelection_ = newList;
newList = NULL;
-
}
/* **********************************************************************
* to be loaded.
* Return: TRUE if data loaded, FALSE if address index not loaded.
*/
-gboolean addressbook_load_completion( gint (*callBackFunc) ( const gchar *, const gchar * ) ) {
- /* AddressInterface *interface; */
- AddressDataSource *ds;
- GList *nodeIf, *nodeDS;
- GList *listP, *nodeP;
- GList *nodeM;
- gchar *sName, *sAddress, *sAlias, *sFriendly;
-
+gboolean addressbook_load_completion(
+ gint (*callBackFunc) ( const gchar *, const gchar *, const gchar * ) )
+{
debug_print( "addressbook_load_completion\n" );
-
- if( _addressIndex_ == NULL ) return FALSE;
-
- nodeIf = addrindex_get_interface_list( _addressIndex_ );
- while( nodeIf ) {
- AddressInterface *interface = nodeIf->data;
- nodeDS = interface->listSource;
- while( nodeDS ) {
- ds = nodeDS->data;
-
- /* Read address book */
- if( ! addrindex_ds_get_read_flag( ds ) ) {
- addrindex_ds_read_data( ds );
- }
-
- /* Get all persons */
- listP = addrindex_ds_get_all_persons( ds );
- nodeP = listP;
- while( nodeP ) {
- ItemPerson *person = nodeP->data;
- nodeM = person->listEMail;
-
- /* Figure out name to use */
- sName = person->nickName;
- if( sName == NULL || *sName == '\0' ) {
- sName = ADDRITEM_NAME(person);
- }
-
- /* Process each E-Mail address */
- while( nodeM ) {
- ItemEMail *email = nodeM->data;
- /* Have mail */
- sFriendly = sName;
- sAddress = email->address;
- if( sAddress || *sAddress != '\0' ) {
- sAlias = ADDRITEM_NAME(email);
- if( sAlias && *sAlias != '\0' ) {
- sFriendly = sAlias;
- }
- ( callBackFunc ) ( sFriendly, sAddress );
- }
-
- nodeM = g_list_next( nodeM );
- }
- nodeP = g_list_next( nodeP );
- }
- /* Free up the list */
- g_list_free( listP );
-
- nodeDS = g_list_next( nodeDS );
- }
- nodeIf = g_list_next( nodeIf );
- }
- debug_print( "addressbook_load_completion... done\n" );
-
- return TRUE;
+ return addrindex_load_completion( _addressIndex_, callBackFunc );
}
/* **********************************************************************
if( adapter->treeNode ) {
abf = addressbook_imp_ldif( _addressIndex_ );
if( abf ) {
- ds = addrindex_index_add_datasource( _addressIndex_, ADDR_IF_BOOK, abf );
- ads = addressbook_create_ds_adapter( ds, ADDR_BOOK, NULL );
- addressbook_ads_set_name( ads, addrbook_get_name( abf ) );
- newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+ ds = addrindex_index_add_datasource(
+ _addressIndex_, ADDR_IF_BOOK, abf );
+ ads = addressbook_create_ds_adapter(
+ ds, ADDR_BOOK, NULL );
+ addressbook_ads_set_name(
+ ads, addrbook_get_name( abf ) );
+ newNode = addressbook_add_object(
+ adapter->treeNode,
+ ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_ctree_select(
+ GTK_CTREE(addrbook.ctree),
+ newNode );
addrbook.treeSelected = newNode;
}
}
}
}
-
}
/*
if( adapter->treeNode ) {
abf = addressbook_imp_mutt( _addressIndex_ );
if( abf ) {
- ds = addrindex_index_add_datasource( _addressIndex_, ADDR_IF_BOOK, abf );
- ads = addressbook_create_ds_adapter( ds, ADDR_BOOK, NULL );
- addressbook_ads_set_name( ads, addrbook_get_name( abf ) );
- newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+ ds = addrindex_index_add_datasource(
+ _addressIndex_, ADDR_IF_BOOK, abf );
+ ads = addressbook_create_ds_adapter(
+ ds, ADDR_BOOK, NULL );
+ addressbook_ads_set_name(
+ ads, addrbook_get_name( abf ) );
+ newNode = addressbook_add_object(
+ adapter->treeNode,
+ ADDRESS_OBJECT(ads) );
+ if( newNode ) {
+ gtk_ctree_select(
+ GTK_CTREE(addrbook.ctree),
+ newNode );
+ addrbook.treeSelected = newNode;
+ }
+
+ /* Notify address completion */
+ invalidate_address_completion();
+ }
+ }
+ }
+}
+
+/*
+* Import Pine file.
+*/
+static void addressbook_import_pine_cb() {
+ AddressDataSource *ds = NULL;
+ AdapterDSource *ads = NULL;
+ AddressBookFile *abf = NULL;
+ AdapterInterface *adapter;
+ GtkCTreeNode *newNode;
+
+ adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+ if( adapter ) {
+ if( adapter->treeNode ) {
+ abf = addressbook_imp_pine( _addressIndex_ );
+ if( abf ) {
+ ds = addrindex_index_add_datasource(
+ _addressIndex_, ADDR_IF_BOOK, abf );
+ ads = addressbook_create_ds_adapter(
+ ds, ADDR_BOOK, NULL );
+ addressbook_ads_set_name(
+ ads, addrbook_get_name( abf ) );
+ newNode = addressbook_add_object(
+ adapter->treeNode,
+ ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_ctree_select(
+ GTK_CTREE(addrbook.ctree),
+ newNode );
addrbook.treeSelected = newNode;
}
}
}
}
+}
+
+/*
+ * Harvest addresses.
+ * Enter: folderItem Folder to import.
+ * sourceInd Source indicator: FALSE - Folder, TRUE - Messages.
+ * msgList List of message numbers, or NULL to process folder.
+ */
+void addressbook_harvest(
+ FolderItem *folderItem, gboolean sourceInd, GList *msgList )
+{
+ AddressDataSource *ds = NULL;
+ AdapterDSource *ads = NULL;
+ AddressBookFile *abf = NULL;
+ AdapterInterface *adapter;
+ GtkCTreeNode *newNode;
+
+ abf = addrgather_dlg_execute(
+ folderItem, _addressIndex_, sourceInd, msgList );
+ if( abf ) {
+ ds = addrindex_index_add_datasource(
+ _addressIndex_, ADDR_IF_BOOK, abf );
+
+ adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+ if( adapter ) {
+ if( adapter->treeNode ) {
+ ads = addressbook_create_ds_adapter(
+ ds, ADDR_BOOK, addrbook_get_name( abf ) );
+ newNode = addressbook_add_object(
+ adapter->treeNode,
+ ADDRESS_OBJECT(ads) );
+ }
+ }
+
+ /* Notify address completion */
+ invalidate_address_completion();
+ }
+}
+
+/*
+* Export HTML file.
+*/
+static void addressbook_export_html_cb( void ) {
+ GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ AddressObject *obj;
+ AddressDataSource *ds = NULL;
+ AddrBookBase *adbase;
+ AddressCache *cache;
+ GtkCTreeNode *node = NULL;
+
+ if( ! addrbook.treeSelected ) return;
+ node = addrbook.treeSelected;
+ if( GTK_CTREE_ROW(node)->level == 1 ) return;
+ obj = gtk_ctree_node_get_row_data( ctree, node );
+ if( obj == NULL ) return;
+
+ ds = addressbook_find_datasource( node );
+ if( ds == NULL ) return;
+ adbase = ( AddrBookBase * ) ds->rawDataSource;
+ cache = adbase->addressCache;
+ addressbook_exp_html( cache );
+}
+
+/*
+* Export LDIF file.
+*/
+static void addressbook_export_ldif_cb( void ) {
+ GtkCTree *ctree = GTK_CTREE(addrbook.ctree);
+ AddressObject *obj;
+ AddressDataSource *ds = NULL;
+ AddrBookBase *adbase;
+ AddressCache *cache;
+ GtkCTreeNode *node = NULL;
+
+ if( ! addrbook.treeSelected ) return;
+ node = addrbook.treeSelected;
+ if( GTK_CTREE_ROW(node)->level == 1 ) return;
+ obj = gtk_ctree_node_get_row_data( ctree, node );
+ if( obj == NULL ) return;
+ ds = addressbook_find_datasource( node );
+ if( ds == NULL ) return;
+ adbase = ( AddrBookBase * ) ds->rawDataSource;
+ cache = adbase->addressCache;
+ addressbook_exp_ldif( cache );
}
/*
projects / claws.git / blobdiff