From: Richard Russon Date: Sat, 9 Apr 2016 21:33:47 +0000 (+0100) Subject: minor style changes to match sidebar X-Git-Tag: neomutt-20160416~1^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cde30280b9fc8c7fa05836b9a6c5695160a4214;p=neomutt minor style changes to match sidebar --- diff --git a/curs_main.c b/curs_main.c index 8e1172dfc..136e5e9cd 100644 --- a/curs_main.c +++ b/curs_main.c @@ -2658,7 +2658,7 @@ int mutt_index_menu (void) break; case OP_SIDEBAR_TOGGLE: - toggle_sidebar(menu->menu); + sb_toggle_virtual(); break; #endif default: diff --git a/sidebar.c b/sidebar.c index 714795a1f..ac97b2348 100644 --- a/sidebar.c +++ b/sidebar.c @@ -816,8 +816,9 @@ draw_sidebar (int first_row, int num_rows, int div_width) } } #ifdef USE_NOTMUCH - else if (b->magic == M_NOTMUCH) + else if (b->magic == M_NOTMUCH) { sidebar_folder_name = b->desc; + } #endif char str[SHORT_STRING]; make_sidebar_entry (str, sizeof (str), w, sidebar_folder_name, b); @@ -1120,14 +1121,17 @@ sb_notify_mailbox (BUFFY *b, int created) } } -/* switch between regualar and virtual folders */ -void toggle_sidebar(int menu) +/** + * sb_toggle_virtual - Switch between regular and virtual folders + */ +void +sb_toggle_virtual (void) { if (sidebar_source == -1) get_incoming(); #ifdef USE_NOTMUCH - if (sidebar_source == SB_SRC_INCOMING && VirtIncoming) + if ((sidebar_source == SB_SRC_INCOMING) && VirtIncoming) sidebar_source = SB_SRC_VIRT; else #endif diff --git a/sidebar.h b/sidebar.h index b61f90322..b63b8cded 100644 --- a/sidebar.h +++ b/sidebar.h @@ -32,6 +32,6 @@ void sb_set_buffystats (const CONTEXT *ctx); BUFFY * sb_set_open_buffy (const char *path); void sb_set_update_time (void); int sb_should_refresh (void); -void toggle_sidebar(int menu); +void sb_toggle_virtual (void); #endif /* SIDEBAR_H */