2006-05-12 [colin] 2.2.0cvs8

	* src/gtk/quicksearch.c
		Add "k" as shortcut for "colorlabel". Patch
		by ath42@users.sf.net.

diff --git a/ChangeLog b/ChangeLog
index 04a471ce0b664fd8e04fe2445ad9ad3e4d0ffaf5..1f6931e99e185d7d337045bcdea53249e41c0970 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-12 [colin]     2.2.0cvs8
+
+       * src/gtk/quicksearch.c
+               Add "k" as shortcut for "colorlabel". Patch
+               by ath42@users.sf.net.
+

 2006-05-12 [paul]      2.2.0cvs7
 
        * src/prefs_common.h
 2006-05-12 [paul]      2.2.0cvs7
 
        * src/prefs_common.h

diff --git a/PATCHSETS b/PATCHSETS
index c480f5f72a7ba7033f6d7a45afb2c2f4a7ea7428..6aa19387773deb004303af87f90492b19e05c942 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1477,3 +1477,4 @@
 ( cvs diff -u -r 1.96.2.112 -r 1.96.2.113 src/textview.c;  ) > 2.2.0cvs5.patchset
 ( cvs diff -u -r 1.395.2.195 -r 1.395.2.196 src/summaryview.c;  ) > 2.2.0cvs6.patchset
 ( cvs diff -u -r 1.103.2.47 -r 1.103.2.48 src/prefs_common.h;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.196 -r 1.395.2.197 src/summaryview.c;  ) > 2.2.0cvs7.patchset
 ( cvs diff -u -r 1.96.2.112 -r 1.96.2.113 src/textview.c;  ) > 2.2.0cvs5.patchset
 ( cvs diff -u -r 1.395.2.195 -r 1.395.2.196 src/summaryview.c;  ) > 2.2.0cvs6.patchset
 ( cvs diff -u -r 1.103.2.47 -r 1.103.2.48 src/prefs_common.h;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.196 -r 1.395.2.197 src/summaryview.c;  ) > 2.2.0cvs7.patchset

+( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/gtk/quicksearch.c;  ) > 2.2.0cvs8.patchset

diff --git a/configure.ac b/configure.ac
index f4726a2feb6f24fe607ff56b21d4f423348ba324..53b549ea3675c40c8a3cb97cbcc558af92c05ce2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=7
+EXTRA_VERSION=8

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index a1a38b723c6c3d52a4d1399eb2fec2ba8a777453..53ac07388385d8daedc5a01fc1a5a50cece5f290 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -264,6 +264,7 @@ static gchar *search_descr_strings[] = {
        "h S",   N_("messages which contain header S"),
        "i S",   N_("messages which contain S in Message-ID header"),
        "I S",   N_("messages which contain S in inreplyto header"),
        "h S",   N_("messages which contain header S"),
        "i S",   N_("messages which contain S in Message-ID header"),
        "I S",   N_("messages which contain S in inreplyto header"),

+       "k #",   N_("messages which are marked with color #"),

        "L",     N_("locked messages"),
        "n S",   N_("messages which are in newsgroup S"),
        "N",     N_("new messages"),
        "L",     N_("locked messages"),
        "n S",   N_("messages which are in newsgroup S"),
        "N",     N_("new messages"),


@@ -704,6 +705,7 @@ gchar *expand_search_string(const gchar *search_string)
                { "h",  "headers_part",                 1,      TRUE,   TRUE  },
                { "i",  "header \"Message-ID\"",        1,      TRUE,   TRUE  },
                { "I",  "inreplyto",                    1,      TRUE,   TRUE  },
                { "h",  "headers_part",                 1,      TRUE,   TRUE  },
                { "i",  "header \"Message-ID\"",        1,      TRUE,   TRUE  },
                { "I",  "inreplyto",                    1,      TRUE,   TRUE  },

+               { "k",  "colorlabel",                   1,      FALSE,  FALSE },

                { "L",  "locked",                       0,      FALSE,  FALSE },
                { "n",  "newsgroups",                   1,      TRUE,   TRUE  },
                { "N",  "new",                          0,      FALSE,  FALSE },
                { "L",  "locked",                       0,      FALSE,  FALSE },
                { "n",  "newsgroups",                   1,      TRUE,   TRUE  },
                { "N",  "new",                          0,      FALSE,  FALSE },