#ifdef USE_LDAP
#include <pthread.h>
-#include "syldap.h"
+#include "ldapserver.h"
#include "editldap.h"
#define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
#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 void key_pressed (GtkWidget *widget,
+static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static gint addressbook_treenode_compare_func (GtkCList *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_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_("/_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}
};
addrclip_free( _clipBoard_ );
}
if( _addressIndex_ != NULL ) {
- addrindex_free_index( _addressIndex_ );
+ addrindex_free_index( _addressIndex_ );
+ addrindex_teardown( _addressIndex_ );
}
_addressSelect_ = NULL;
_clipBoard_ = NULL;
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);
}
Compose *compose;
AddrSelectItem *item;
AddrItemObject *aio;
- gchar *addr;
+ const gchar *addr;
+ gchar *tmpaddr;
compose = addrbook.target_compose;
if( ! compose ) return;
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 );
}
}
/* 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 );
}
menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
-
- addrbook.listSelected = NULL;
}
static void addressbook_list_selected(GtkCList *clist, gint row, gint column,
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)
}
}
-static void addressbook_folder_load_one_person( GtkCTree *clist, ItemPerson *person,
- AddressTypeControlItem *atci, AddressTypeControlItem *atciMail) {
-
+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];
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 );
+ 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 ) {
/* 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() );
* 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;
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;
}
}
-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;
- gchar *desc;
+/**
+ * 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 ) {
- g_snprintf( addressbook_msgbuf,
- sizeof(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 ) {
- g_snprintf( addressbook_msgbuf,
- sizeof(addressbook_msgbuf), "%s",
- name );
- }
- else {
- desc = addressbook_err2string(
- _lutErrorsLDAP_, svr->retVal );
- g_snprintf( addressbook_msgbuf,
- sizeof(addressbook_msgbuf),
- "%s: %s", name, desc );
- }
+ desc = NULL;
}
+ g_snprintf( addressbook_msgbuf,
+ sizeof(addressbook_msgbuf), "%s", desc );
}
addressbook_status_show( addressbook_msgbuf );
}
-static void addressbook_ldap_show_results( 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;
-
- 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), "" );
- }
- }
- }
+ addressbook_set_clist( obj );
}
-/*
- * LDAP idle function. This function is called during UI idle time while
- * an LDAP search is in progress.
- * Enter: data Reference to LDAP server object.
+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_ldap_idle( gpointer data ) {
- SyldapServer *server;
+static void addressbook_search_idle( gpointer data ) {
+ /*
+ gint queryID;
- server = ( SyldapServer * ) data;
- if( ! server->busyFlag ) {
- /* Server has completed search - remove from idle list */
- gtk_idle_remove( server->idleId );
+ 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;
- /* Process callback and free up the thread */
- addressbook_ldap_show_results( server );
- g_free( server->thread );
- server->thread = NULL;
+ data = GINT_TO_POINTER( queryID );
+ if( data ) {
+ gtk_idle_remove_by_data( data );
}
+ addressbook_refresh_current();
+ addressbook_search_message( queryType, status );
}
-/*
- * Perform lookup for LDAP search.
- * Enter: ads Adapter for data source.
- * sLookup Lookup string.
+/**
+ * Perform search.
+ *
+ * \param ds Data source to search.
+ * \param searchTerm String to lookup.
+ * \param pNode Parent data source node.
*/
-static void addressbook_ldap_lookup( AdapterDSource *ads, gchar *sLookup ) {
- AddressDataSource *ds = NULL;
- AddressInterface *iface = NULL;
- SyldapServer *server;
+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;
- 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 );
- server->idleId = gtk_idle_add(
- ( GtkFunction ) addressbook_ldap_idle, server );
- syldap_read_data_th( server );
- addressbook_ldap_show_message( server );
+ if( ds->type == ADDR_IF_LDAP ) {
+#ifdef USE_LDAP
+ aoType = ADDR_LDAP_QUERY;
+#endif
+ }
+ else {
+ return;
+ }
+ abf = ds->rawDataSource;
+
+ /* Setup a query */
+ if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
+
+
+ /* 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_ );
}
-#endif
-/*
- * Lookup button handler.
+/**
+ * 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 = GTK_CTREE(addrbook.ctree);
+ GtkCTree *ctree;
AddressObject *obj;
- AdapterDSource *ads = NULL;
- gchar *sLookup;
+ AddressDataSource *ds;
+ AddressInterface *iface;
+ gchar *searchTerm;
+ GtkCTreeNode *node, *parentNode;
- if( ! addrbook.treeSelected ) return;
- if( GTK_CTREE_ROW( addrbook.treeSelected )->level == 1 ) return;
+ node = addrbook.treeSelected;
+ if( ! node ) return;
+ if( GTK_CTREE_ROW(node)->level == 1 ) return;
- obj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
+ ctree = GTK_CTREE(addrbook.ctree);
+ obj = gtk_ctree_node_get_row_data( ctree, node );
if( obj == NULL ) return;
- sLookup = gtk_editable_get_chars( GTK_EDITABLE(addrbook.entry), 0, -1 );
- g_strchomp( sLookup );
+ ds = addressbook_find_datasource( node );
+ if( ds == NULL ) return;
- if( obj->type == ADDR_DATASOURCE ) {
- ads = ADAPTER_DSOURCE(obj);
-#ifdef USE_LDAP
- if( ads->subType == ADDR_LDAP ) {
- addressbook_ldap_lookup( ads, sLookup );
- }
-#endif /* USE_LDAP */
+ /* 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;
}
+ else {
+ parentNode = node;
+ }
+ addressbook_perform_search( ds, searchTerm, parentNode );
- g_free( sLookup );
+ g_free( searchTerm );
}
/* **********************************************************************
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 *, const gchar * ) ) {
- 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_modify_flag( ds ) ) {
- addrindex_ds_read_data( ds );
- }
-
- 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, sName );
- }
-
- 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 );
}
/* **********************************************************************
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 );
+}
+
/*
* End of Source.
*/
projects / claws.git / blobdiff