X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt-sidebar.patch;h=0b02d91e563eb01c5612f37eab0cf5ddad828b2d;hp=0e08bfb44560def249b2051144b6f5b1e549a8f6;hb=9b7ff4e7ae64b6a8036923fcb4c9f77e15cd8432;hpb=2c6e17e385038adb7b609e88d136f6bf78f3a18d

diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index 0e08bfb..0b02d91 100644
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -1002,79 +1002,12 @@
 *** 33,38 ****
 --- 33,39 ----
   	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
-  	score.c send.c sendlib.c signal.c sort.c \
+  	score.c send.c sendlib.c signal.c signature.c sort.c \
   	status.c system.c thread.c charset.c history.c lib.c \
 + 	sidebar.c \
-  	muttlib.c editmsg.c mbyte.c \
+  	muttlib.c editmsg.c mbyte.c mutt_idna.c \
   	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
   
-*** mutt-1.5.24-orig/Makefile.in	2015-08-30 12:24:26.000000000 -0500
---- mutt-1.5.24/Makefile.in	2015-09-16 23:18:13.000000000 -0500
-***************
-*** 83,92 ****
-  	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-  	$(am__configure_deps) $(srcdir)/config.h.in \
-  	$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-! 	$(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \
-! 	snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \
-! 	strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \
-! 	README TODO compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-  	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
---- 83,92 ----
-  	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-  	$(am__configure_deps) $(srcdir)/config.h.in \
-  	$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
-! 	$(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \
-! 	strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \
-! 	strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \
-! 	compile config.guess config.sub install-sh missing
-  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
-  	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
-  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
-***************
-*** 128,136 ****
-  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-! 	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-! 	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-! 	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
---- 128,137 ----
-  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
-  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-! 	history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \
-! 	muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \
-! 	url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
-! 	safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
-***************
-*** 474,479 ****
---- 475,481 ----
-  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
-  	score.c send.c sendlib.c signal.c sort.c \
-  	status.c system.c thread.c charset.c history.c lib.c \
-+ 	sidebar.c \
-  	muttlib.c editmsg.c mbyte.c \
-  	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-  
-***************
-*** 804,809 ****
---- 806,812 ----
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
-+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@
-  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@
 *** mutt-1.5.24-orig/mbox.c	2015-08-30 12:06:38.000000000 -0500
 --- mutt-1.5.24/mbox.c	2015-09-16 23:18:13.000000000 -0500
 ***************
@@ -2197,7 +2130,7 @@
 + 		/* calculate depth of current folder and generate its display name with indented spaces */
 + 		int sidebar_folder_depth = 0;
 + 		char *sidebar_folder_name;
-+ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
++ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + ((Maildir[strlen(Maildir) - 1] == '/' || Maildir[strlen(Maildir) - 1] == '}') ? 0 : 1));
 + 		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
 + 			char *tmp_folder_name;
 + 			int i;