* some extern variables
*/
-
-extern int curitem;
extern int views_count;
-extern int items;
WINDOW *editw;
int width = strwidth(tab_name) + 5;
if(x_pos + width + 1 > EDITW_COLS) {
- statusline_msg(_("Tab name too wide for screen"));
- /* Disabling this field */
- /* TODO should be recomputed on window resize */
- views_count--;
+ statusline_addstr(_("Tab name too wide for screen"));
break;
}
void
get_first_email(char *str, int item)
{
- char *tmp;
+ char *tmp, *emails = db_email_get(item);
- if(!db_email_get(item)) {
+ if(!*emails) {
*str = 0;
return;
}
- strncpy(str, db_email_get(item), MAX_EMAIL_LEN);
+ strncpy(str, emails, MAX_EMAIL_LEN);
+ free(emails);
if( (tmp = strchr(str, ',')) )
*tmp = 0;
else
str[MAX_EMAIL_LEN - 1] = 0;
}
+/* This only rolls emails from the 'email' field, not emails from any
+ * field of type FIELD_EMAILS.
+ * TODO: expand to ask for which field to roll if several are present? */
static void
roll_emails(int item, enum rotate_dir dir)
{
- abook_list *emails = csv_to_abook_list(db_email_get(item));
+ abook_list *emails = csv_to_abook_list(db_fget(item, EMAIL));
if(!emails)
return;
- free(db_email_get(item));
+ free(db_fget(item, EMAIL));
abook_list_rotate(&emails, dir);
db_fput(item, EMAIL, abook_list_to_csv(emails));
abook_list_free(&emails);
get_first_email(email, item);
- if(*db_email_get(item))
+ if(*email)
snprintf(header, EDITW_COLS, "%s <%s>",
db_name_get(item),
email);
void
edit_item(int item)
{
- if( item < 0 ) {
- if( curitem < 0 )
+ if(item < 0) {
+ if(list_get_curitem() < 0)
return;
else
- item = curitem;
+ item = list_get_curitem();
}
init_editor();
while((item = edit_loop(item)) >= 0)
- curitem = item; /* hmm, this is not very clean way to go */
+ list_set_curitem(item); /* this is not very clean way to go */
close_editor();
}
char *field = NULL;
list_item item = item_create();
- change_field("Name: ", &field, MAX_FIELD_LEN);
+ change_field(_("Name: "), &field, MAX_FIELD_LEN);
if( field == NULL )
return;
add_item2database(item);
item_free(&item);
- curitem = LAST_ITEM;
+ list_set_curitem(last_item());
- edit_item(LAST_ITEM);
+ edit_item(last_item());
}