Merge branch 'upstream' of ssh://antonio-guest@git.debian.org/git/pkg-mutt/mutt

[software/mutt-debian.git] / debian / patches / mutt-patched / sidebar-sorted

diff --git a/debian/patches/mutt-patched/sidebar-sorted b/debian/patches/mutt-patched/sidebar-sorted
index dbfa3cf6baeadfbe9cdfeaa7b6b0cc9d0fa9f1da..5467465134485fbf4959528745d498c1e32c4b39 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-sorted
+++ b/debian/patches/mutt-patched/sidebar-sorted
@@ -11,8 +11,10 @@ I hope, it's usefull for someone ;)
 PS: This has to be applied ontop of my sidebar-dotted patch, but it
 should be easy to adopt it to a vanilla mutt.
 
 PS: This has to be applied ontop of my sidebar-dotted patch, but it
 should be easy to adopt it to a vanilla mutt.
 

---- a/sidebar.c
-+++ b/sidebar.c
+Index: mutt/sidebar.c
+===================================================================
+--- mutt.orig/sidebar.c        2009-06-25 12:36:59.000000000 +0200
++++ mutt/sidebar.c     2009-06-25 12:37:03.000000000 +0200

 @@ -54,6 +54,35 @@
        for ( ; tmp->next != 0; tmp = tmp->next )
                tmp->next->prev = tmp;
 @@ -54,6 +54,35 @@
        for ( ; tmp->next != 0; tmp = tmp->next )
                tmp->next->prev = tmp;


@@ -49,9 +51,11 @@ should be easy to adopt it to a vanilla mutt.
        if ( TopBuffy == 0 && BottomBuffy == 0 )
                TopBuffy = Incoming;
        if ( BottomBuffy == 0 ) {
        if ( TopBuffy == 0 && BottomBuffy == 0 )
                TopBuffy = Incoming;
        if ( BottomBuffy == 0 ) {

---- a/init.h
-+++ b/init.h
-@@ -1984,6 +1984,11 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:59.000000000 +0200
++++ mutt/init.h        2009-06-25 12:37:03.000000000 +0200
+@@ -1974,6 +1974,11 @@

    ** .pp
    ** Should the sidebar shorten the path showed.
    */
    ** .pp
    ** Should the sidebar shorten the path showed.
    */


@@ -63,9 +67,11 @@ should be easy to adopt it to a vanilla mutt.
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp

---- a/mutt.h
-+++ b/mutt.h
-@@ -428,6 +428,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:36:59.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:37:03.000000000 +0200
+@@ -427,6 +427,7 @@

    OPTSCORE,
    OPTSIDEBAR,
    OPTSIDEBARSHORTPATH,
    OPTSCORE,
    OPTSIDEBAR,
    OPTSIDEBARSHORTPATH,