propagate from branch 'org.openembedded.dev' (head 62f17dde6e02af42bf4eab7e425978b66cea3823)

            to branch 'org.openembedded.nslu2-linux' (head ae92e5985633489c84c89296f06f7bcc0f02bf2a)

13 files changed, 1726 insertions, 9 deletions

diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb
index 193ae3c0d0..905ce519b8 100644
--- a/packages/evince/evince_0.3.2.bb
+++ b/packages/evince/evince_0.3.2.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Evince is simply a document viewer"
-LICENSE = ""
+LICENSE = "GPL"
 DEPENDS = "tiff espgs-native espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
 RDEPENDS = "espgs"
 RRECOMMENDS = "gnome-vfs-plugin-file"
diff --git a/packages/gpe-login/gpe-login_0.81.bb b/packages/gpe-login/gpe-login_0.81.bb
new file mode 100644
index 0000000000..594bde73c3
--- /dev/null
+++ b/packages/gpe-login/gpe-login_0.81.bb
@@ -0,0 +1,11 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Philip Blundell <pb@handhelds.org>"
+DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS    = "xkbd"
+RPROVIDES   = "gpe-session-starter"
+PR = "r0"
diff --git a/packages/gpe-mixer/gpe-mixer_0.42.bb b/packages/gpe-mixer/gpe-mixer_0.42.bb
new file mode 100644
index 0000000000..3d3ef98917
--- /dev/null
+++ b/packages/gpe-mixer/gpe-mixer_0.42.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+PR = "r0"
+
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE audio mixer"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
diff --git a/packages/gs/gs_8.01.bb b/packages/gs/gs_8.16.bb
index 180fd8b32a..cf1e8ba411 100644
--- a/packages/gs/gs_8.01.bb
+++ b/packages/gs/gs_8.16.bb
@@ -1,21 +1,22 @@
 DESCRIPTION = "An interpreter of the Postscript language"
 LICENSE = "GPL"
 SECTION = "console/utils"
-SRC_URI = "ftp://ftp.gnu.org/gnu/ghostscript/gnughostscript-${PV}.tar.gz"
+HOMEPAGE = "http://www.gnu.org/software/ghostscript/ghostscript.html"
 DEPENDS = "jpeg zlib"
-PR = "r2"
+PR = "r0"
 
-# | make: ./obj/echogs: Command not found
-BROKEN = "1"
-
-S = "${WORKDIR}/gnughostscript-${PV}"
-
-FILES_${PN} += "${datadir}/ghostscript"
+SRC_URI = "${GNU_MIRROR}/ghostscript/gnu-ghostscript-${PV}.tar.gz"
+S = "${WORKDIR}/gnu-ghostscript-${PV}"
 
 inherit autotools flow-lossage
 
 EXTRA_OECONF = "--without-x"
 
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
 do_compile() {
 	oe_runmake CCAUX="${BUILD_CC}"
 }
@@ -23,3 +24,5 @@ do_compile() {
 do_install() {
 	oe_runmake bindir='${D}${bindir}' datadir='${D}${datadir}' libdir='${D}${libdir}' install
 }
+
+FILES_${PN} += "${datadir}/ghostscript"
diff --git a/packages/kdepimpi/kdepimpi_2.1.16.bb b/packages/kdepimpi/kdepimpi_2.1.18.bb
index f3dde1a2fd..f3dde1a2fd 100644
--- a/packages/kdepimpi/kdepimpi_2.1.16.bb
+++ b/packages/kdepimpi/kdepimpi_2.1.18.bb
diff --git a/packages/kdepimpi/pwmpi_2.1.16.bb b/packages/kdepimpi/pwmpi_2.1.18.bb
index 904f640955..904f640955 100644
--- a/packages/kdepimpi/pwmpi_2.1.16.bb
+++ b/packages/kdepimpi/pwmpi_2.1.18.bb
diff --git a/packages/mutt/mutt-1.5.9i/.mtn2git_empty b/packages/mutt/mutt-1.5.9i/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mutt/mutt-1.5.9i/.mtn2git_empty
diff --git a/packages/mutt/mutt-1.5.9i/cppflags.patch b/packages/mutt/mutt-1.5.9i/cppflags.patch
new file mode 100644
index 0000000000..774bc020ed
--- /dev/null
+++ b/packages/mutt/mutt-1.5.9i/cppflags.patch
@@ -0,0 +1,11 @@
+--- mutt-1.5.9/Makefile.am.orig	2005-08-04 08:58:08.169498584 +0000
++++ mutt-1.5.9/Makefile.am	2005-08-04 08:58:30.514101688 +0000
+@@ -55,7 +55,7 @@
+ 
+ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+ 
+-CPPFLAGS=@CPPFLAGS@ -I$(includedir)
++CPPFLAGS=@CPPFLAGS@
+ 
+ 
+ EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
diff --git a/packages/mutt/mutt-1.5.9i/makedoc.patch b/packages/mutt/mutt-1.5.9i/makedoc.patch
new file mode 100644
index 0000000000..f2b64a6f22
--- /dev/null
+++ b/packages/mutt/mutt-1.5.9i/makedoc.patch
@@ -0,0 +1,11 @@
+--- mutt-1.5.9/makedoc.c.orig	2005-08-04 10:26:18.686217792 +0000
++++ mutt-1.5.9/makedoc.c	2005-08-04 10:26:36.254547000 +0000
+@@ -49,7 +49,7 @@
+ #ifndef HAVE_STRERROR
+ #ifndef STDC_HEADERS
+ extern int sys_nerr;
+-extern char *sys_errlist[];
++extern __const char *__const sys_errlist[];
+ #endif
+ 
+ #define strerror(x) ((x) > 0 && (x) < sys_nerr) ? sys_errlist[(x)] : 0
diff --git a/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp b/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp
new file mode 100644
index 0000000000..ebe6a1b014
--- /dev/null
+++ b/packages/mutt/mutt-1.5.9i/patch-1.5.9i.sidebar.20050628.txt.hackedfornntp
@@ -0,0 +1,1527 @@
+diff -N -c -r mutt-1.5.9i-orig/buffy.c mutt-1.5.9i-patched/buffy.c
+*** mutt-1.5.9i-orig/buffy.c	2005-02-03 13:47:52.000000000 -0500
+--- mutt-1.5.9i-patched/buffy.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 267,273 ****
+    char path[_POSIX_PATH_MAX];
+    struct stat contex_sb;
+    time_t t;
+! 
+  #ifdef USE_IMAP
+    /* update postponed count as well, on force */
+    if (force)
+--- 267,273 ----
+    char path[_POSIX_PATH_MAX];
+    struct stat contex_sb;
+    time_t t;
+!   CONTEXT *ctx;
+  #ifdef USE_IMAP
+    /* update postponed count as well, on force */
+    if (force)
+***************
+*** 300,305 ****
+--- 300,307 ----
+    
+    for (tmp = Incoming; tmp; tmp = tmp->next)
+    {
++ 	if ( tmp->new == 1 )
++ 		tmp->has_new = 1;
+      tmp->new = 0;
+  
+  #ifdef USE_IMAP
+***************
+*** 353,362 ****
+        case M_MBOX:
+        case M_MMDF:
+  
+! 	if (STAT_CHECK)
+  	{
+  	  BuffyCount++;
+! 	  tmp->new = 1;
+  	}
+  #ifdef BUFFY_SIZE
+  	else
+--- 355,380 ----
+        case M_MBOX:
+        case M_MMDF:
+  
+!     {
+! 	if (STAT_CHECK || tmp->msgcount == 0)
+  	{
++ 	  BUFFY b = *tmp;
++ 	  int msgcount = 0;
++ 	  int msg_unread = 0;
+  	  BuffyCount++;
+! 	  /* parse the mailbox, to see how much mail there is */
+! 	  ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
+! 	  if(ctx)
+! 	  {
+! 	      msgcount = ctx->msgcount;
+! 	      msg_unread = ctx->unread;
+! 	      mx_close_mailbox(ctx, 0);
+! 	  }
+! 	  *tmp = b;
+! 	  tmp->msgcount = msgcount;
+! 	  tmp->msg_unread = msg_unread;
+! 	  if(STAT_CHECK)
+! 	      tmp->has_new = tmp->new = 1;
+  	}
+  #ifdef BUFFY_SIZE
+  	else
+***************
+*** 368,408 ****
+  	if (tmp->newly_created &&
+  	    (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+  	  tmp->newly_created = 0;
+! 
+  	break;
+  
+        case M_MAILDIR:
+  
+  	snprintf (path, sizeof (path), "%s/new", tmp->path);
+  	if ((dirp = opendir (path)) == NULL)
+  	{
+  	  tmp->magic = 0;
+  	  break;
+  	}
+  	while ((de = readdir (dirp)) != NULL)
+  	{
+  	  char *p;
+  	  if (*de->d_name != '.' && 
+  	      (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+  	  {
+! 	    /* one new and undeleted message is enough */
+! 	    BuffyCount++;
+! 	    tmp->new = 1;
+! 	    break;
+  	  }
+  	}
+  	closedir (dirp);
+  	break;
+  
+        case M_MH:
+! 	if ((tmp->new = mh_buffy (tmp->path)) > 0)
+! 	  BuffyCount++;
+  	break;
+  	
+  #ifdef USE_IMAP
+        case M_IMAP:
+! 	if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0)
+  	  BuffyCount++;
+  	else
+  	  tmp->new = 0;
+  
+--- 386,471 ----
+  	if (tmp->newly_created &&
+  	    (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+  	  tmp->newly_created = 0;
+! 	}
+  	break;
+  
+        case M_MAILDIR:
+  
++         /* count new message */
+  	snprintf (path, sizeof (path), "%s/new", tmp->path);
+  	if ((dirp = opendir (path)) == NULL)
+  	{
+  	  tmp->magic = 0;
+  	  break;
+  	}
++ 	tmp->msgcount = 0;
++ 	tmp->msg_unread = 0;
+  	while ((de = readdir (dirp)) != NULL)
+  	{
+  	  char *p;
+  	  if (*de->d_name != '.' && 
+  	      (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+  	  {
+! 	    tmp->has_new = tmp->new = 1;
+!             tmp->msgcount++;
+!             tmp->msg_unread++;
+! 	  }
+! 	}
+!         if(tmp->msg_unread)
+!           BuffyCount++;
+! 
+! 	closedir (dirp);
+! 
+!         /*
+!          * count read messages (for folderlist (sidebar) we also need to count
+!          * messages in cur so that we the total number of messages
+!          */
+! 	snprintf (path, sizeof (path), "%s/cur", tmp->path);
+! 	if ((dirp = opendir (path)) == NULL)
+! 	{
+! 	  tmp->magic = 0;
+! 	  break;
+! 	}
+! 	while ((de = readdir (dirp)) != NULL)
+! 	{
+! 	  char *p;
+! 	  if (*de->d_name != '.' && 
+! 	      (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+! 	  {
+!             tmp->msgcount++;
+  	  }
+  	}
+  	closedir (dirp);
+  	break;
+  
+        case M_MH:
+! 	{
+!       DIR *dp;
+!       struct dirent *de;
+! 	  if ((tmp->new = mh_buffy (tmp->path)) > 0)
+! 	    BuffyCount++;
+!   
+!       if ((dp = opendir (path)) == NULL)
+!         break;
+! 	  tmp->msgcount = 0;
+!       while ((de = readdir (dp)))
+!       {
+!         if (mh_valid_message (de->d_name))
+!         {
+! 		  tmp->msgcount++;
+! 		  tmp->has_new = tmp->new = 1;
+!         }
+!       }
+!       closedir (dp);
+!     }
+  	break;
+  	
+  #ifdef USE_IMAP
+        case M_IMAP:
+! 	  tmp->msgcount = imap_mailbox_check(tmp->path, 0);
+! 	if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
+  	  BuffyCount++;
++ 	}
+  	else
+  	  tmp->new = 0;
+  
+diff -N -c -r mutt-1.5.9i-orig/buffy.h mutt-1.5.9i-patched/buffy.h
+*** mutt-1.5.9i-orig/buffy.h	2002-12-11 06:19:39.000000000 -0500
+--- mutt-1.5.9i-patched/buffy.h	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 27,33 ****
+--- 27,37 ----
+    long size;
+  #endif				/* BUFFY_SIZE */
+    struct buffy_t *next;
++   struct buffy_t *prev;
+    short new;			/* mailbox has new mail */
++   short has_new;		/* set it new if new and not read */
++   int msgcount;			/* total number of messages */
++   int msg_unread;		/* number of unread messages */
+    short notified;		/* user has been notified */
+    short magic;			/* mailbox type */
+    short newly_created;		/* mbox or mmdf just popped into existence */
+diff -N -c -r mutt-1.5.9i-orig/color.c mutt-1.5.9i-patched/color.c
+*** mutt-1.5.9i-orig/color.c	2005-02-03 13:47:52.000000000 -0500
+--- mutt-1.5.9i-patched/color.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 93,98 ****
+--- 93,99 ----
+    { "bold",		MT_COLOR_BOLD },
+    { "underline",	MT_COLOR_UNDERLINE },
+    { "index",		MT_COLOR_INDEX },
++   { "sidebar_new",	MT_COLOR_NEW },
+    { NULL,		0 }
+  };
+  
+diff -N -c -r mutt-1.5.9i-orig/compose.c mutt-1.5.9i-patched/compose.c
+*** mutt-1.5.9i-orig/compose.c	2005-02-03 13:47:52.000000000 -0500
+--- mutt-1.5.9i-patched/compose.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 72,78 ****
+  
+  #define HDR_XOFFSET 10
+  #define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */
+! #define W (COLS - HDR_XOFFSET)
+  
+  static char *Prompts[] =
+  {
+--- 72,78 ----
+  
+  #define HDR_XOFFSET 10
+  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
+! #define W (COLS - HDR_XOFFSET - SidebarWidth)
+  
+  static char *Prompts[] =
+  {
+***************
+*** 148,154 ****
+      }
+    clrtoeol ();
+  
+!   move (HDR_CRYPTINFO, 0);
+    clrtoeol ();
+    if ((WithCrypto & APPLICATION_PGP)
+        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
+--- 148,154 ----
+      }
+    clrtoeol ();
+  
+!   move (HDR_CRYPTINFO, SidebarWidth);
+    clrtoeol ();
+    if ((WithCrypto & APPLICATION_PGP)
+        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
+***************
+*** 164,170 ****
+        && (msg->security & ENCRYPT)
+        && SmimeCryptAlg
+        && *SmimeCryptAlg) {
+!       mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
+  		NONULL(SmimeCryptAlg));
+        off = 20;
+    }
+--- 164,170 ----
+        && (msg->security & ENCRYPT)
+        && SmimeCryptAlg
+        && *SmimeCryptAlg) {
+!       mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
+  		NONULL(SmimeCryptAlg));
+        off = 20;
+    }
+***************
+*** 178,184 ****
+    int c;
+    char *t;
+  
+!   mvaddstr (HDR_MIX, 0,     "     Mix: ");
+  
+    if (!chain)
+    {
+--- 178,184 ----
+    int c;
+    char *t;
+  
+!   mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
+  
+    if (!chain)
+    {
+***************
+*** 193,199 ****
+      if (t && t[0] == '0' && t[1] == '\0')
+        t = "<random>";
+      
+!     if (c + mutt_strlen (t) + 2 >= COLS)
+        break;
+  
+      addstr (NONULL(t));
+--- 193,199 ----
+      if (t && t[0] == '0' && t[1] == '\0')
+        t = "<random>";
+      
+!     if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
+        break;
+  
+      addstr (NONULL(t));
+***************
+*** 245,251 ****
+  
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), addr, 1);
+!   mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
+    mutt_paddstr (W, buf);
+  }
+  
+--- 245,251 ----
+  
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), addr, 1);
+!   mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
+    mutt_paddstr (W, buf);
+  }
+  
+***************
+*** 269,275 ****
+  #endif
+  
+    SETCOLOR (MT_COLOR_STATUS);
+!   mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
+    BKGDSET (MT_COLOR_STATUS);
+    clrtoeol ();
+  
+--- 269,275 ----
+  #endif
+  
+    SETCOLOR (MT_COLOR_STATUS);
+!   mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
+    BKGDSET (MT_COLOR_STATUS);
+    clrtoeol ();
+  
+***************
+*** 307,313 ****
+    /* redraw the expanded list so the user can see the result */
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), *addr, 1);
+!   move (line, HDR_XOFFSET);
+    mutt_paddstr (W, buf);
+    
+    return 0;
+--- 307,313 ----
+    /* redraw the expanded list so the user can see the result */
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), *addr, 1);
+!   move (line, HDR_XOFFSET+SidebarWidth);
+    mutt_paddstr (W, buf);
+    
+    return 0;
+***************
+*** 553,559 ****
+  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+  	{
+  	  mutt_str_replace (&msg->env->subject, buf);
+! 	  move (HDR_SUBJECT, HDR_XOFFSET);
+  	  clrtoeol ();
+  	  if (msg->env->subject)
+  	    mutt_paddstr (W, msg->env->subject);
+--- 553,559 ----
+  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+  	{
+  	  mutt_str_replace (&msg->env->subject, buf);
+! 	  move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
+  	  clrtoeol ();
+  	  if (msg->env->subject)
+  	    mutt_paddstr (W, msg->env->subject);
+***************
+*** 570,576 ****
+  	{
+  	  strfcpy (fcc, buf, _POSIX_PATH_MAX);
+  	  mutt_pretty_mailbox (fcc);
+! 	  move (HDR_FCC, HDR_XOFFSET);
+  	  mutt_paddstr (W, fcc);
+  	  fccSet = 1;
+  	}
+--- 570,576 ----
+  	{
+  	  strfcpy (fcc, buf, _POSIX_PATH_MAX);
+  	  mutt_pretty_mailbox (fcc);
+! 	  move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
+  	  mutt_paddstr (W, fcc);
+  	  fccSet = 1;
+  	}
+diff -N -c -r mutt-1.5.9i-orig/curs_main.c mutt-1.5.9i-patched/curs_main.c
+*** mutt-1.5.9i-orig/curs_main.c	2005-02-28 13:36:35.000000000 -0500
+--- mutt-1.5.9i-patched/curs_main.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 28,33 ****
+--- 28,34 ----
+  #include "sort.h"
+  #include "buffy.h"
+  #include "mx.h"
++ #include "sidebar.h"
+  
+  #ifdef USE_POP
+  #include "pop.h"
+***************
+*** 538,543 ****
+--- 539,545 ----
+      if (menu->redraw & REDRAW_FULL)
+      {
+        menu_redraw_full (menu);
++       draw_sidebar(menu->menu);
+        mutt_show_error ();
+      }
+  
+***************
+*** 560,570 ****
+--- 562,575 ----
+  
+        if (menu->redraw & REDRAW_STATUS) 
+        {
++ 	DrawFullLine = 1;
+  	menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
++ 	DrawFullLine = 0;
+  	CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
+  	SETCOLOR (MT_COLOR_STATUS);
+  	mutt_paddstr (COLS, buf);
+  	SETCOLOR (MT_COLOR_NORMAL);
++         set_buffystats(Context);
+  	menu->redraw &= ~REDRAW_STATUS;
+        }
+  
+***************
+*** 1040,1045 ****
+--- 1045,1051 ----
+  	  menu->redraw = REDRAW_FULL;
+  	break;
+  
++       case OP_SIDEBAR_OPEN:
+        case OP_MAIN_CHANGE_FOLDER:
+        
+  	if (attach_msg)
+***************
+*** 1057,1063 ****
+  	buf[0] = '\0';
+  	mutt_buffy (buf, sizeof (buf));
+  
+! 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+  	  break;
+  	if (!buf[0])
+  	{
+--- 1063,1073 ----
+  	buf[0] = '\0';
+  	mutt_buffy (buf, sizeof (buf));
+  
+! 	if ( op == OP_SIDEBAR_OPEN ) {
+!           if(!CurBuffy)
+!             break;
+! 	  strncpy( buf, CurBuffy->path, sizeof(buf) );
+!         } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+  	  break;
+  	if (!buf[0])
+  	{
+***************
+*** 1066,1071 ****
+--- 1076,1082 ----
+  	}
+  
+  	mutt_expand_path (buf, sizeof (buf));
++         set_curbuffy(buf);
+  	if (mx_get_magic (buf) <= 0)
+  	{
+  	  mutt_error (_("%s is not a mailbox."), buf);
+***************
+*** 2092,2097 ****
+--- 2103,2114 ----
+  	mutt_what_key();
+  	break;
+  
++ 	  case OP_SIDEBAR_SCROLL_UP:
++ 	  case OP_SIDEBAR_SCROLL_DOWN:
++ 	  case OP_SIDEBAR_NEXT:
++ 	  case OP_SIDEBAR_PREV:
++ 	    scroll_sidebar(op, menu->menu);
++ 		break;
+        default:
+  	if (menu->menu == MENU_MAIN)
+  	  km_error_key (MENU_MAIN);
+diff -N -c -r mutt-1.5.9i-orig/flags.c mutt-1.5.9i-patched/flags.c
+*** mutt-1.5.9i-orig/flags.c	2005-02-03 13:47:52.000000000 -0500
+--- mutt-1.5.9i-patched/flags.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 22,29 ****
+--- 22,31 ----
+  
+  #include "mutt.h"
+  #include "mutt_curses.h"
++ #include "mutt_menu.h"
+  #include "sort.h"
+  #include "mx.h"
++ #include "sidebar.h"
+  
+  #ifdef USE_IMAP
+  #include "imap_private.h"
+***************
+*** 274,279 ****
+--- 276,282 ----
+     */
+    if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged))
+      h->searched = 0;
++ 	draw_sidebar(0);
+  }
+  
+  void mutt_tag_set_flag (int flag, int bf)
+diff -N -c -r mutt-1.5.9i-orig/functions.h mutt-1.5.9i-patched/functions.h
+*** mutt-1.5.9i-orig/functions.h	2005-02-19 08:49:39.000000000 -0500
+--- mutt-1.5.9i-patched/functions.h	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 149,154 ****
+--- 149,159 ----
+    { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
+  
+  
++   { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
++   { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
++   { "sidebar-next",	OP_SIDEBAR_NEXT, NULL },
++   { "sidebar-prev",	OP_SIDEBAR_PREV, NULL },
++   { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+    { NULL,			0,				NULL }
+  };
+  
+***************
+*** 243,248 ****
+--- 248,258 ----
+    { "decrypt-save",    	OP_DECRYPT_SAVE,		NULL },
+  
+  
++   { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
++   { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
++   { "sidebar-next",	OP_SIDEBAR_NEXT, NULL },
++   { "sidebar-prev",	OP_SIDEBAR_PREV, NULL },
++   { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+    { NULL,		0,				NULL }
+  };
+  
+diff -N -c -r mutt-1.5.9i-orig/globals.h mutt-1.5.9i-patched/globals.h
+*** mutt-1.5.9i-orig/globals.h	2005-02-12 15:01:02.000000000 -0500
+--- mutt-1.5.9i-patched/globals.h	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 179,184 ****
+--- 179,187 ----
+  WHERE short ScoreThresholdRead;
+  WHERE short ScoreThresholdFlag;
+  
++ WHERE struct buffy_t *CurBuffy INITVAL(0);
++ WHERE short DrawFullLine INITVAL(0);
++ WHERE short SidebarWidth;
+  #ifdef USE_IMAP
+  WHERE short ImapKeepalive;
+  #endif
+diff -N -c -r mutt-1.5.9i-orig/init.h mutt-1.5.9i-patched/init.h
+*** mutt-1.5.9i-orig/init.h	2005-03-01 10:56:02.000000000 -0500
+--- mutt-1.5.9i-patched/init.h	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 1078,1083 ****
+--- 1078,1093 ----
+    ** This specifies the folder into which read mail in your ``$$spoolfile''
+    ** folder will be appended.
+    */
++   { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
++   /*
++   ** .pp
++   ** This specifies whether or not to show sidebar (left-side list of folders).
++   */
++   { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
++   /*
++   ** .pp
++   ** The width of the sidebar.
++   */
+    { "mbox_type",	DT_MAGIC,R_NONE, UL &DefaultMagic, M_MBOX },
+    /*
+    ** .pp
+diff -N -c -r mutt-1.5.9i-orig/mailbox.h mutt-1.5.9i-patched/mailbox.h
+*** mutt-1.5.9i-orig/mailbox.h	2002-11-12 02:53:09.000000000 -0500
+--- mutt-1.5.9i-patched/mailbox.h	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 27,32 ****
+--- 27,33 ----
+  #define M_NEWFOLDER	(1<<4) /* create a new folder - same as M_APPEND, but uses
+  				* safe_fopen() for mbox-style folders.
+  				*/
++ #define M_PEEK		(1<<5) /* revert atime back after taking a look (if applicable) */
+  
+  /* mx_open_new_message() */
+  #define M_ADD_FROM	1	/* add a From_ line */
+diff -N -c -r mutt-1.5.9i-orig/Makefile.in mutt-1.5.9i-patched/Makefile.in
+*** mutt-1.5.9i-orig/Makefile.in	2005-03-13 11:37:46.000000000 -0500
+--- mutt-1.5.9i-patched/Makefile.in	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 94,100 ****
+  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+  	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
+  	wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
+! 	mutt_idna.$(OBJEXT) crypt-mod.$(OBJEXT)
+  mutt_OBJECTS = $(am_mutt_OBJECTS)
+  am__DEPENDENCIES_1 =
+  am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
+--- 94,101 ----
+  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+  	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
+  	wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
+! 	mutt_idna.$(OBJEXT) crypt-mod.$(OBJEXT) \
+! 	sidebar.$(OBJEXT)
+  mutt_OBJECTS = $(am_mutt_OBJECTS)
+  am__DEPENDENCIES_1 =
+  am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
+***************
+*** 304,310 ****
+  	score.c send.c sendlib.c signal.c sort.c \
+  	status.c system.c thread.c charset.c history.c lib.c \
+  	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
+! 	url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
+  
+  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+  	$(INTLLIBS) $(LIBICONV)  $(LIBGPGME_LIBS)
+--- 305,312 ----
+  	score.c send.c sendlib.c signal.c sort.c \
+  	status.c system.c thread.c charset.c history.c lib.c \
+  	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
+! 	url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \
+! 	sidebar.c
+  
+  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+  	$(INTLLIBS) $(LIBICONV)  $(LIBGPGME_LIBS)
+***************
+*** 337,343 ****
+  	makedoc.c stamp-doc-rc README.SSL smime.h\
+  	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh	\
+  	ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
+! 	snprintf.c regex.c crypt-gpgme.h
+  
+  EXTRA_SCRIPTS = smime_keys
+  mutt_dotlock_SOURCES = mutt_dotlock.c
+--- 339,345 ----
+  	makedoc.c stamp-doc-rc README.SSL smime.h\
+  	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh	\
+  	ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
+! 	snprintf.c regex.c crypt-gpgme.h sidebar.h
+  
+  EXTRA_SCRIPTS = smime_keys
+  mutt_dotlock_SOURCES = mutt_dotlock.c
+diff -N -c -r mutt-1.5.9i-orig/mbox.c mutt-1.5.9i-patched/mbox.c
+*** mutt-1.5.9i-orig/mbox.c	2005-02-03 13:47:53.000000000 -0500
+--- mutt-1.5.9i-patched/mbox.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 97,102 ****
+--- 97,103 ----
+      mutt_perror (ctx->path);
+      return (-1);
+    }
++   ctx->atime = sb.st_atime;
+    ctx->mtime = sb.st_mtime;
+    ctx->size = sb.st_size;
+  
+***************
+*** 245,250 ****
+--- 246,252 ----
+  
+    ctx->size = sb.st_size;
+    ctx->mtime = sb.st_mtime;
++   ctx->atime = sb.st_atime;
+  
+  #ifdef NFS_ATTRIBUTE_HACK
+    if (sb.st_mtime > sb.st_atime)
+diff -N -c -r mutt-1.5.9i-orig/menu.c mutt-1.5.9i-patched/menu.c
+*** mutt-1.5.9i-orig/menu.c	2005-02-28 10:13:57.000000000 -0500
+--- mutt-1.5.9i-patched/menu.c	2005-05-25 14:53:34.000000000 -0400
+***************
+*** 24,29 ****
+--- 24,30 ----
+  #include "mutt_curses.h"
+  #include "mutt_menu.h"
+  #include "mbyte.h"
++ #include "sidebar.h"
+  
+  #ifdef USE_IMAP
+  #include "imap.h"
+***************
+*** 157,163 ****
+  void menu_pad_string (char *s, size_t n)
+  {
+    int shift = option (OPTARROWCURSOR) ? 3 : 0;
+!   int cols = COLS - shift;
+  
+    mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
+    s[n - 1] = 0;
+--- 158,164 ----
+  void menu_pad_string (char *s, size_t n)
+  {
+    int shift = option (OPTARROWCURSOR) ? 3 : 0;
+!   int cols = COLS - shift - SidebarWidth;
+  
+    mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
+    s[n - 1] = 0;
+***************
+*** 207,212 ****
+--- 208,214 ----
+    char buf[STRING];
+    int i;
+  
++   draw_sidebar(1);
+    for (i = menu->top; i < menu->top + menu->pagelen; i++)
+    {
+      if (i < menu->max)
+***************
+*** 217,223 ****
+        if (option (OPTARROWCURSOR))
+        {
+          attrset (menu->color (i));
+! 	CLEARLINE (i - menu->top + menu->offset);
+  
+  	if (i == menu->current)
+  	{
+--- 219,225 ----
+        if (option (OPTARROWCURSOR))
+        {
+          attrset (menu->color (i));
+! 	CLEARLINE_WIN (i - menu->top + menu->offset);
+  
+  	if (i == menu->current)
+  	{
+***************
+*** 228,234 ****
+  	  addch (' ');
+  	}
+  	else
+! 	  move (i - menu->top + menu->offset, 3);
+  
+          print_enriched_string (menu->color(i), (unsigned char *) buf, 1);
+          SETCOLOR (MT_COLOR_NORMAL);          
+--- 230,236 ----
+  	  addch (' ');
+  	}
+  	else
+! 	  move (i - menu->top + menu->offset, SidebarWidth + 3);
+  
+          print_enriched_string (menu->color(i), (unsigned char *) buf, 1);
+          SETCOLOR (MT_COLOR_NORMAL);          
+***************
+*** 243,256 ****
+  	  BKGDSET (MT_COLOR_INDICATOR);
+  	}
+  
+! 	CLEARLINE (i - menu->top + menu->offset);
+  	print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
+          SETCOLOR (MT_COLOR_NORMAL);
+          BKGDSET (MT_COLOR_NORMAL);
+        }
+      }
+      else
+!       CLEARLINE (i - menu->top + menu->offset);
+    }
+    menu->redraw = 0;
+  }
+--- 245,258 ----
+  	  BKGDSET (MT_COLOR_INDICATOR);
+  	}
+  
+! 	CLEARLINE_WIN (i - menu->top + menu->offset);
+  	print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
+          SETCOLOR (MT_COLOR_NORMAL);
+          BKGDSET (MT_COLOR_NORMAL);
+        }
+      }
+      else
+!       CLEARLINE_WIN (i - menu->top + menu->offset);
+    }
+    menu->redraw = 0;
+  }
+***************
+*** 265,271 ****
+      return;
+    }
+    
+!   move (menu->oldcurrent + menu->offset - menu->top, 0);
+    SETCOLOR (MT_COLOR_NORMAL);
+    BKGDSET (MT_COLOR_NORMAL);
+  
+--- 267,273 ----
+      return;
+    }
+    
+!   move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
+    SETCOLOR (MT_COLOR_NORMAL);
+    BKGDSET (MT_COLOR_NORMAL);
+  
+***************
+*** 280,292 ****
+        clrtoeol ();
+        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+        menu_pad_string (buf, sizeof (buf));
+!       move (menu->oldcurrent + menu->offset - menu->top, 3);
+        print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+        SETCOLOR (MT_COLOR_NORMAL);
+      }
+  
+      /* now draw it in the new location */
+!     move (menu->current + menu->offset - menu->top, 0);
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      addstr ("->");
+--- 282,294 ----
+        clrtoeol ();
+        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+        menu_pad_string (buf, sizeof (buf));
+!       move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
+        print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+        SETCOLOR (MT_COLOR_NORMAL);
+      }
+  
+      /* now draw it in the new location */
+!     move (menu->current + menu->offset - menu->top, SidebarWidth);
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      addstr ("->");
+***************
+*** 307,313 ****
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      BKGDSET (MT_COLOR_INDICATOR);
+!     CLEARLINE (menu->current - menu->top + menu->offset);
+      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+      SETCOLOR (MT_COLOR_NORMAL);
+      BKGDSET (MT_COLOR_NORMAL);
+--- 309,315 ----
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      BKGDSET (MT_COLOR_INDICATOR);
+!     CLEARLINE_WIN (menu->current - menu->top + menu->offset);
+      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+      SETCOLOR (MT_COLOR_NORMAL);
+      BKGDSET (MT_COLOR_NORMAL);
+***************
+*** 319,325 ****
+  {
+    char buf[STRING];
+    
+!   move (menu->current + menu->offset - menu->top, 0);
+    m