Browse Source

Fix drawing of sidebar delimiter with the intended attributes of the status bar

Ralf S. Engelschall 18 years ago
parent
commit
1127e02363
2 changed files with 35 additions and 1 deletions
  1. 32 0
      mutt/mutt.patch.sidebar
  2. 3 1
      mutt/mutt.spec

+ 32 - 0
mutt/mutt.patch.sidebar

@@ -0,0 +1,32 @@
+Fix drawing of sidebar delimiter with the intended
+attributes of the "status" bar --rse 20070906
+
+Index: sidebar.c
+--- sidebar.c.orig	2007-09-06 16:47:29 +0200
++++ sidebar.c	2007-09-06 16:48:21 +0200
+@@ -186,23 +186,14 @@
+       return 0;
+     }
+ 
+-        /* get attributes for divider */
+-	SETCOLOR(MT_COLOR_STATUS);
+-#ifndef USE_SLANG_CURSES
+-        attr_get(&attrs, &color_pair, 0);
+-#else
+-        color_pair = attr_get();
+-#endif
+-	SETCOLOR(MT_COLOR_NORMAL);
+ 
+ 	/* draw the divider */
+ 
+ 	for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
++		SETCOLOR(MT_COLOR_STATUS);
+ 		move(lines, SidebarWidth - delim_len);
+ 		addstr(NONULL(SidebarDelim));
+-#ifndef USE_SLANG_CURSES
+-                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
+-#endif
++		SETCOLOR(MT_COLOR_NORMAL);
+ 	}
+ 
+ 	if ( Incoming == 0 ) return 0;

+ 3 - 1
mutt/mutt.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Mail
 License:      BSD
 Version:      %{V_mutt}
-Release:      20070905
+Release:      20070906
 
 #   build options
 %option       with_pop       no
@@ -63,6 +63,7 @@ Patch1:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mu
 Patch2:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.vvv.initials.gz
 Patch3:       ftp://ftp.mutt.org.ua/pub/mutt/mutt-%{V_mutt_patches}/patch-%{V_mutt_patches}.vvv.quote.gz
 Patch4:       http://lunar-linux.org/~tchan/mutt/patch-%{V_mutt_patches_sidebar}.txt
+Patch5:       mutt.patch.sidebar
 
 #   build information
 Prefix:       %{l_prefix}
@@ -170,6 +171,7 @@ AutoReqProv:  no
 %endif
 %if "%{with_sidebar}" == "yes"
     %patch -p1 -P 4
+    %patch -p0 -P 5
 %endif
     %{l_shtool} subst \
         -e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%t"};' \