static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete) {
+ else if (event && event->keyval == GDK_KEY_Delete) {
/* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
if ( /* address_index_has_focus || */ address_list_has_focus )
addressbook_del_clicked(NULL, NULL);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), 0, COL_FOLDER_WIDTH);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_TRIANGLE);
- }
+ gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
gtk_cmctree_set_indent(GTK_CMCTREE(ctree), CTREE_INDENT);
gtk_cmclist_set_compare_func(GTK_CMCLIST(ctree),
clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_EXTENDED);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_NONE);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
- GTK_CMCTREE_EXPANDER_TRIANGLE);
- }
+ gtk_cmctree_set_line_style(GTK_CMCTREE(clist), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(clist),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
gtk_cmctree_set_indent(GTK_CMCTREE(clist), CTREE_INDENT);
gtk_cmclist_set_column_width(GTK_CMCLIST(clist), COL_NAME,
gtk_cmctree_get_node_info(ctree, node, text, &spacing,
&pix_cl, &pix_op,
&is_leaf, &expanded);
- gtk_sctree_set_node_info(ctree, node, name, spacing,
+ gtk_cmctree_set_node_info(ctree, node, name, spacing,
pix_cl, pix_op,
is_leaf, expanded);
}
if( obj->type == ADDR_DATASOURCE ) {
/* Remove node from tree */
gtk_cmctree_remove_node( ctree, node );
-
+
+ if (delType == ADDRTREE_DEL_DATA &&
+ ds->interface && ds->interface->type == ADDR_IF_BOOK)
+ addrbook_delete_book_file((AddressBookFile *) ds->rawDataSource);
+
/* Remove data source. */
if( addrindex_index_remove_datasource( _addressIndex_, ds ) ) {
addrindex_free_datasource( ds );
static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter))
addressbook_lup_clicked(NULL, NULL);
return FALSE;
}