Attachment #274451 for bug #368519

Lines 1984-1989 Link Here

(-)mutt-1.5.20.orig/init.h (+5 lines)
1984	** .pp	1984	** .pp
1985	** Should the sidebar shorten the path showed.	1985	** Should the sidebar shorten the path showed.
1986	*/	1986	*/
		1987	{ "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
		1988	/*
		1989	** .pp
		1990	** Should the sidebar be sorted.
		1991	*/
1987	{ "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},	1992	{ "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
1988	/*	1993	/*
1989	** .pp	1994	** .pp

Lines 428-433 Link Here

(-)mutt-1.5.20.orig/mutt.h (+1 lines)
428	OPTSCORE,	428	OPTSCORE,
429	OPTSIDEBAR,	429	OPTSIDEBAR,
430	OPTSIDEBARSHORTPATH,	430	OPTSIDEBARSHORTPATH,
		431	OPTSIDEBARSORT,
431	OPTSIGDASHES,	432	OPTSIGDASHES,
432	OPTSIGONTOP,	433	OPTSIGONTOP,
433	OPTSORTRE,	434	OPTSORTRE,




	for ( ; tmp->next != 0; tmp = tmp->next )
		tmp->next->prev = tmp;

	if (option(OPTSIDEBARSORT)) {
		int needsort=1;
		BUFFY *prev;
		BUFFY *next;
		BUFFY *tmp2;
		while (needsort==1) {
			needsort=0;
			tmp = Incoming;
			for ( ; tmp ; tmp=tmp->next ) {
				if (tmp->next != NULL && strcmp(tmp->path, tmp->next->path) > 0) {
					needsort=1;
					prev = tmp->prev;
					next = tmp->next;
					if (prev != NULL)
						prev->next = next;
					else
						Incoming = next;
					next->prev = prev;
					tmp2 = next->next;
					next->next = tmp;
					tmp->prev = next;
					tmp->next = tmp2;
					if (tmp2 != NULL)
						tmp2->prev = tmp;
				}
			}
		}
	}

	if ( TopBuffy == 0 && BottomBuffy == 0 )
		TopBuffy = Incoming;
	if ( BottomBuffy == 0 ) {

Return to bug 368519

Lines 54-59 Link Here

(-)mutt-1.5.20.orig/sidebar.c (+29 lines)
54	for ( ; tmp->next != 0; tmp = tmp->next )	54	for ( ; tmp->next != 0; tmp = tmp->next )
55	tmp->next->prev = tmp;	55	tmp->next->prev = tmp;
56		56
		57	if (option(OPTSIDEBARSORT)) {
		58	int needsort=1;
		59	BUFFY *prev;
		60	BUFFY *next;
		61	BUFFY *tmp2;
		62	while (needsort==1) {
		63	needsort=0;
		64	tmp = Incoming;
		65	for ( ; tmp ; tmp=tmp->next ) {
		66	if (tmp->next != NULL && strcmp(tmp->path, tmp->next->path) > 0) {
		67	needsort=1;
		68	prev = tmp->prev;
		69	next = tmp->next;
		70	if (prev != NULL)
		71	prev->next = next;
		72	else
		73	Incoming = next;
		74	next->prev = prev;
		75	tmp2 = next->next;
		76	next->next = tmp;
		77	tmp->prev = next;
		78	tmp->next = tmp2;
		79	if (tmp2 != NULL)
		80	tmp2->prev = tmp;
		81	}
		82	}
		83	}
		84	}
		85
57	if ( TopBuffy == 0 && BottomBuffy == 0 )	86	if ( TopBuffy == 0 && BottomBuffy == 0 )
58	TopBuffy = Incoming;	87	TopBuffy = Incoming;
59	if ( BottomBuffy == 0 ) {	88	if ( BottomBuffy == 0 ) {