X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftabs.c;h=4b58ba590a64c086ce8eba75dd18583f63ff4655;hb=HEAD;hp=53b8e87c06558cda72da79918ccb221b664ec4d6;hpb=8217ed8772edbc04987f10ee2d93ace9c4932317;p=citadel.git diff --git a/webcit/tabs.c b/webcit/tabs.c index 53b8e87c0..4b58ba590 100644 --- a/webcit/tabs.c +++ b/webcit/tabs.c @@ -1,7 +1,3 @@ -/* - * $Id$ - * - */ #include #define SHOW_ME_VAPPEND_PRINTF #include "webcit.h" @@ -9,7 +5,7 @@ /* * print tabbed dialog */ -void tabbed_dialog(int num_tabs, char *tabnames[]) { +void tabbed_dialog(int num_tabs, const char *tabnames[]) { int i; StrBufAppendPrintf(WC->trailing_javascript, @@ -86,13 +82,6 @@ void end_tab(int tabnum, int num_tabs) { else { wc_printf("\n"); wc_printf("\n", tabnum, num_tabs); - - if (tabnum == num_tabs-1) { - wc_printf("" - ); - } } } @@ -138,7 +127,7 @@ void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]) { ( (i==0) ? "tab_cell_label" : "tab_cell_edit" ), i ); - StrBufAppendBuf(Target, tabnames[i], 0); + StrEscAppend(Target, tabnames[i], NULL, 0, 0); StrBufAppendBufPlain( Target, HKEY( @@ -173,7 +162,7 @@ void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names) { else { StrBufAppendBufPlain( Target, - HKEY("\n", tabnum, num_tabs); - - if (tabnum == num_tabs-1) { - StrBufAppendBufPlain( - Target, - HKEY( - ""), 0); - } + "\n", tabnum, num_tabs + ); } - if (HAVEBSTR("last_tabsel")) + if (havebstr("last_tabsel")) { StrBufAppendPrintf(Target, "", BSTR("last_tabsel")); }