static GtkItemFactoryEntry addressbook_entries[] =
{
- {N_("/_Book"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Book/New _Book"), "<control>B", addressbook_new_book_cb, 0, NULL},
- {N_("/_Book/New _Folder"), "<control>R", addressbook_new_folder_cb, 0, NULL},
- {N_("/_Book/New _vCard"), "<control><shift>D", addressbook_new_vcard_cb, 0, NULL},
+ {N_("/_Book"), NULL, NULL, 0, "<Branch>", NULL},
+ {N_("/_Book/New _Book"), "<control>B", addressbook_new_book_cb, 0, NULL, NULL},
+ {N_("/_Book/New _Folder"), "<control>R", addressbook_new_folder_cb, 0, NULL, NULL},
+ {N_("/_Book/New _vCard"), "<control><shift>D", addressbook_new_vcard_cb, 0, NULL, NULL},
#ifdef USE_JPILOT
- {N_("/_Book/New _JPilot"), "<control>J", addressbook_new_jpilot_cb, 0, NULL},
+ {N_("/_Book/New _JPilot"), "<control>J", addressbook_new_jpilot_cb, 0, NULL, NULL},
#endif
#ifdef USE_LDAP
- {N_("/_Book/New LDAP _Server"), "<control><shift>S", addressbook_new_ldap_cb, 0, NULL},
+ {N_("/_Book/New LDAP _Server"), "<control><shift>S", addressbook_new_ldap_cb, 0, NULL, NULL},
#endif
- {N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Edit book"), NULL, addressbook_treenode_edit_cb, 0, NULL},
- {N_("/_Book/_Delete book"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Save"), "<control>S", addressbook_file_save_cb, 0, NULL},
- {N_("/_Book/_Close"), "<control>W", close_cb, 0, NULL},
- {N_("/_Address"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Address/_Select all"), "<control>A", addressbook_select_all_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/C_ut"), "<control>X", addressbook_clip_cut_cb, 0, NULL},
- {N_("/_Address/_Copy"), "<control>C", addressbook_clip_copy_cb, 0, NULL},
- {N_("/_Address/_Paste"), "<control>V", addressbook_clip_paste_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/_Edit"), "<control>Return",addressbook_edit_address_cb, 0, NULL},
- {N_("/_Address/_Delete"), "<control>D", addressbook_delete_address_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/New _Address"), "<control>N", addressbook_new_address_cb, 0, NULL},
- {N_("/_Address/New _Group"), "<control>G", addressbook_new_group_cb, 0, NULL},
- {N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Address/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
- {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {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, "<Branch>"},
- {N_("/_Help/_About"), NULL, about_show, 0, NULL}
+ {N_("/_Book/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Book/_Edit book"), NULL, addressbook_treenode_edit_cb, 0, NULL, NULL},
+ {N_("/_Book/_Delete book"), NULL, addressbook_treenode_delete_cb, 0, NULL, NULL},
+ {N_("/_Book/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Book/_Save"), "<control>S", addressbook_file_save_cb, 0, NULL, NULL},
+ {N_("/_Book/_Close"), "<control>W", close_cb, 0, NULL, NULL},
+ {N_("/_Address"), NULL, NULL, 0, "<Branch>", NULL},
+ {N_("/_Address/_Select all"), "<control>A", addressbook_select_all_cb, 0, NULL, NULL},
+ {N_("/_Address/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Address/C_ut"), "<control>X", addressbook_clip_cut_cb, 0, NULL, NULL},
+ {N_("/_Address/_Copy"), "<control>C", addressbook_clip_copy_cb, 0, NULL, NULL},
+ {N_("/_Address/_Paste"), "<control>V", addressbook_clip_paste_cb, 0, NULL, NULL},
+ {N_("/_Address/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Address/_Edit"), "<control>Return",addressbook_edit_address_cb, 0, NULL, NULL},
+ {N_("/_Address/_Delete"), "<control>D", addressbook_delete_address_cb, 0, NULL, NULL},
+ {N_("/_Address/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Address/New _Address"), "<control>N", addressbook_new_address_cb, 0, NULL, NULL},
+ {N_("/_Address/New _Group"), "<control>G", addressbook_new_group_cb, 0, NULL, NULL},
+ {N_("/_Address/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Address/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL, NULL},
+ {N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL},
+ {N_("/_Tools/Import _LDIF file..."), NULL, addressbook_import_ldif_cb, 0, NULL, NULL},
+ {N_("/_Tools/Import M_utt file..."), NULL, addressbook_import_mutt_cb, 0, NULL, NULL},
+ {N_("/_Tools/Import _Pine file..."), NULL, addressbook_import_pine_cb, 0, NULL, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Tools/Export _HTML..."), NULL, addressbook_export_html_cb, 0, NULL, NULL},
+ {N_("/_Tools/Export LDI_F..."), NULL, addressbook_export_ldif_cb, 0, NULL, NULL},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL},
+ {N_("/_Help/_About"), NULL, about_show, 0, NULL, NULL}
};
static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
{
- {N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL},
- {N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {"/---", 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},
- {"/---", 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}
+ {N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL, NULL},
+ {N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/New _Book"), NULL, addressbook_new_book_cb, 0, NULL, NULL},
+ {N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL, NULL},
+ {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/C_ut"), NULL, addressbook_treenode_cut_cb, 0, NULL, NULL},
+ {N_("/_Copy"), NULL, addressbook_treenode_copy_cb, 0, NULL, NULL},
+ {N_("/_Paste"), NULL, addressbook_treenode_paste_cb, 0, NULL, NULL}
};
static GtkItemFactoryEntry addressbook_list_popup_entries[] =
{
- {N_("/_Select all"), NULL, addressbook_select_all_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL},
- {N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL},
- {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {"/---", 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},
- {"/---", 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},
+ {N_("/_Select all"), NULL, addressbook_select_all_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL, NULL},
+ {N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL, NULL},
+ {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+ {N_("/C_ut"), NULL, addressbook_clip_cut_cb, 0, NULL, NULL},
+ {N_("/_Copy"), NULL, addressbook_clip_copy_cb, 0, NULL, NULL},
+ {N_("/_Paste"), NULL, addressbook_clip_paste_cb, 0, NULL, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>", NULL},
+/* {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL, NULL},*/
+ {N_("/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL, NULL},
#ifdef USE_LDAP
- {N_("/_Browse Entry"), NULL, addressbook_browse_entry_cb, 0, NULL},
+ {N_("/_Browse Entry"), NULL, addressbook_browse_entry_cb, 0, NULL, NULL},
#endif
};
name2 = GTK_CELL_TEXT (row2->cell[sort_column_number])->text;
if( ! name1 ) return ( name2 != NULL );
if( ! name2 ) return -1;
- return strcasecmp( name1, name2 );
+ return g_utf8_collate( name1, name2 );
} else {
/* Order groups before person */
if( aio1->type == ITEMTYPE_GROUP ) {
addritem_folder_remove_person(ADAPTER_FOLDER(pobj)->itemFolder, item);
item = addrbook_remove_person( abf, item );
#ifdef USE_LDAP
- if (ds->type == ADDR_IF_LDAP) {
+ if (ds && ds->type == ADDR_IF_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, item);
/* Load folders into the tree */
rootFolder = addrindex_ds_get_root_folder( ds );
- if( ds->type == ADDR_IF_JPILOT ) {
+ if( ds && ds->type == ADDR_IF_JPILOT ) {
aot = ADDR_CATEGORY;
}
- else if( ds->type == ADDR_IF_LDAP ) {
+ else if( ds && ds->type == ADDR_IF_LDAP ) {
aot = ADDR_LDAP_QUERY;
}
else {
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
canDelete = canEdit;
}
- if( iface->type == ADDR_IF_LDAP ) {
+ if( iface && iface->type == ADDR_IF_LDAP ) {
if( obj ) canBrowse = TRUE;
canEdit = TRUE;
canDelete = TRUE;
aio = gtk_ctree_node_get_row_data( clist, node );
if( aio ) {
- /* printf( "list select: %d : '%s'\n", aio->type, aio->name ); */
+ /* g_print( "list select: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_add( aio, ds );
}
aio = gtk_ctree_node_get_row_data( ctree, node );
if( aio != NULL ) {
- /* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
+ /* g_print( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_remove( aio );
}
adapter->itemFolder = NULL;
/*
- printf( "remove folder for ::%s::\n", obj->name );
- printf( " folder name ::%s::\n", ADDRITEM_NAME(folder) );
- printf( "-------------- remove results\n" );
+ g_print( "remove folder for ::%s::\n", obj->name );
+ g_print( " folder name ::%s::\n", ADDRITEM_NAME(folder) );
+ g_print( "-------------- remove results\n" );
*/
addrindex_remove_results( ds, folder );
- /* printf( "-------------- remove node\n" ); */
+ /* g_print( "-------------- remove node\n" ); */
gtk_ctree_remove_node( ctree, node );
return;
}
/* Setup a query */
if( *title == '\0' || strlen( title ) < 1 ) return NULL;
- if( ds->type == ADDR_IF_LDAP ) {
+ if( ds && ds->type == ADDR_IF_LDAP ) {
#if USE_LDAP
aoType = ADDR_LDAP_QUERY;
#endif
abf = ds->rawDataSource;
if( abf == NULL ) {
- printf("no addressbook file\n");
+ g_print("no addressbook file\n");
return;
}
ItemPerson *person;
ItemFolder *folder = NULL;
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
GtkCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
addressbook_new_address_from_book_post_cb,
TRUE );
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
ItemPerson *person;
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
GtkCTreeNode *parentNode;
ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
if( ds == NULL ) return;
addressbook_new_address_from_folder_post_cb,
TRUE );
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
LdapServer *server = ds->rawDataSource;
ldapsvr_set_modified(server, TRUE);
ldapsvr_update_book(server, NULL);
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
(prefs_common.addressbook_use_editaddress_dialog||force_focus) )
!= NULL ) {
#ifdef USE_LDAP
- if (abf->type == ADDR_IF_LDAP) {
+ if (abf && abf->type == ADDR_IF_LDAP) {
ldapsvr_set_modified( (LdapServer *) abf, TRUE );
person->status = UPDATE_ENTRY;
}
gchar *text[N_LIST_COLS];
gboolean flgFirst = TRUE, haveAddr = FALSE;
GList *node;
+#ifdef USE_LDAP
AddressBookFile *abf = addressbook_get_book_file();
+#endif
if( person == NULL ) return;
if( GTK_CTREE_ROW(node)->level < 2 ) return NULL;
ao = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
if( ao ) {
- /* printf( "ao->type = %d\n", ao->type ); */
+ /* g_print( "ao->type = %d\n", ao->type ); */
if( ao->type == ADDR_DATASOURCE ) {
AdapterDSource *ads = ADAPTER_DSOURCE(ao);
- /* printf( "found it\n" ); */
+ /* g_print( "found it\n" ); */
ds = ads->dataSource;
break;
}
}
if( obj->type == ADDR_INTERFACE ) {
- /* printf( "set_clist: loading datasource...\n" ); */
+ /* g_print( "set_clist: loading datasource...\n" ); */
/* addressbook_node_load_datasource( GTK_CTREE(clist), obj ); */
return;
}
gint queryID;
queryID = GPOINTER_TO_INT( data );
- printf( "addressbook_ldap_idle... queryID=%d\n", queryID );
+ g_print( "addressbook_ldap_idle... queryID=%d\n", queryID );
*/
}
/* Setup a query */
if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
- if( ds->type == ADDR_IF_LDAP ) {
+ if( ds && ds->type == ADDR_IF_LDAP ) {
#if USE_LDAP
aoType = ADDR_LDAP_QUERY;
#endif
return;
}
- if( iface->type == ADDR_IF_LDAP ) {
+ if( iface && iface->type == ADDR_IF_LDAP ) {
browseldap_entry(ds, person->externalID);
}
}
splitStr = g_strsplit( selectStr, ",", -1 );
for( i = 0; i < ADDRESSBOOK_MAX_IFACE; i++ ) {
if( splitStr[i] ) {
- /* printf( "%d : %s\n", i, splitStr[i] ); */
+ /* g_print( "%d : %s\n", i, splitStr[i] ); */
ifType = strtol( splitStr[i], &endptr, 10 );
enabled = TRUE;
if( *endptr ) {
enabled = FALSE;
}
}
- /* printf( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
+ /* g_print( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
adapter = addrbookctl_find_interface( ifType );
if( adapter ) {
newList = g_list_append( newList, adapter );
break;
}
}
- /* printf( "i=%d\n", i ); */
+ /* g_print( "i=%d\n", i ); */
g_strfreev( splitStr );
g_free( selectStr );
} else {
*folderpath = g_strdup_printf("%s", book->fileName);
}
- debug_print( "addressbook_foldersel: %s\n", *folderpath);
+ debug_print( "addressbook_foldersel: %s\n", *folderpath?*folderpath:"(null)");
return (*folderpath != NULL);
}
return FALSE;
if (gtk_clist_get_selection_info
(GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
- if (y > height - 24 && height + vpos < total_height)
+ if (y > height - 24 && height + vpos < total_height) {
gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
- if (y < 24 && y > 0)
+ gtk_adjustment_changed(pos);
+ }
+ if (y < 24 && y > 0) {
gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
-
+ gtk_adjustment_changed(pos);
+ }
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
if (node != NULL) {