rpm/mutt
1
0
Fork 1
forked from pool/mutt
Code Pull Requests Activity

Accepting request 145844 from home:aginies:branches:server:mail

Browse Source 
- update sidebar to version 20120829
- fix nion sidebar patch

OBS-URL: https://build.opensuse.org/request/show/145844
OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=82
This commit is contained in:
Dr. Werner Fink 2012-12-19 11:07:46 +00:00 committed by Git OBS Bridge
parent b29a645bb3
commit 9db7d7a444
6 changed files with 2407 additions and 1539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aw.listreply.diff
View File

@ -6,7 +6,7 @@ Index: mutt-1.5.21/PATCHES
+++ mutt-1.5.21/PATCHES 2012-06-21 11:48:50.352837436 +0200
@@ -1,3 +1,4 @@
+patch-1.5.9.aw.listreply.1
patch-1.5.20.sidebar.20090619.txt
patch-1.5.21.sidebar.20120829.txt
patch-1.5.19.rr.compressed.1
patch-1.5.5.1.nt.xtitles.3.ab.1
Index: mutt-1.5.21/init.h

1513
mutt-1.5.21.sidebar.20090619.patch
View File

File diff suppressed because it is too large Load Diff

2373
mutt-1.5.21.sidebar.20120829.patch Normal file
View File

File diff suppressed because it is too large Load Diff

5
mutt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 18 16:26:45 UTC 2012 - aginies@suse.com
- update sidebar to version 20120829
-------------------------------------------------------------------
Tue Sep 18 15:47:45 UTC 2012 - vmiklos@suse.cz

4
mutt.spec
View File

@ -61,7 +61,7 @@ Requires(postun): shared-mime-info
# desktop selections.
#Requires: desktop-data-SuSE
Version: 1.5.21
Release: 0
Release: 33.2
Summary: Mail Program
License: GPL-2.0+
Group: Productivity/Networking/Email/Clients
@ -83,7 +83,7 @@ Patch3: %name-1.5.20-sendgroupreplyto.diff
Patch4: %name-1.5.15-wrapcolumn.diff
Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1
# http://lunar-linux.org/index.php?page=mutt-sidebar
Patch6: mutt-1.5.21.sidebar.20090619.patch
Patch6: mutt-1.5.21.sidebar.20120829.patch
Patch7: mutt-1.5.21-opennfs.dif
Patch8: mutt-1.5.20-gpgme_set_locale.patch
Patch9: bug-676388-largefile.patch

49
nion.sidebar-color.diff
View File

@ -34,36 +34,39 @@ diff --git a/sidebar.c b/sidebar.c
index 9e12319..4b37b76 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -195,22 +195,26 @@ int draw_sidebar(int menu) {
}
@@ -250,13 +250,14 @@
}
/* get attributes for divider */
- SETCOLOR(MT_COLOR_STATUS);
+ SETCOLOR(MT_COLOR_SIDEBAR);
/* get attributes for divider */
- SETCOLOR(MT_COLOR_STATUS);
+ SETCOLOR(MT_COLOR_SIDEBAR);
#ifndef USE_SLANG_CURSES
attr_get(&attrs, &color_pair, 0);
attr_get(&attrs, &color_pair, 0);
#else
color_pair = attr_get();
color_pair = attr_get();
#endif
- SETCOLOR(MT_COLOR_NORMAL);
SETCOLOR(MT_COLOR_NORMAL);
+ /* SETCOLOR(MT_COLOR_SIDEBAR); */
/* draw the divider */
/* draw the divider */
for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
move(lines, SidebarWidth - delim_len);
- addstr(NONULL(SidebarDelim));
@@ -266,10 +267,14 @@
for ( ; lines < SidebarHeight; lines++ ) {
move(lines, SidebarWidth - delim_len);
- addstr(NONULL(SidebarDelim));
-#ifndef USE_SLANG_CURSES
- mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
- mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
-#endif
+ if (option (OPTASCIICHARS))
+ addstr (NONULL (SidebarDelim));
+ else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|"))
+ addch (ACS_VLINE);
+ else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|"))
+ addstr ("\342\224\202");
+ else
+ addstr (NONULL (SidebarDelim));
}
+ if (option (OPTASCIICHARS))
+ addstr (NONULL (SidebarDelim));
+ else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|"))
+ addch (ACS_VLINE);
+ else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|"))
+ addstr ("\342\224\202");
+ else
+ addstr (NONULL (SidebarDelim));
}
if ( Incoming == 0 ) return 0;
if ( Incoming == 0 ) return 0;