summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-13 21:25:15 +0000
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-13 21:25:15 +0000
commit5d082ef08c8cc5cceda2f1682554d30aa7847484 (patch)
treea20ed712ff269733f4ce9571d2912f59011eec54
parentd1356c16c66246403c2d7aaf3b1d57e57f3c0cec (diff)
downloadevolution-data-server-5d082ef08c8cc5cceda2f1682554d30aa7847484.tar.gz
Revert to the old order, as the new one could break mailing list names for
* camel-mime-utils.c: Revert to the old order, as the new one could break mailing list names for existing users.
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-mime-utils.c34
2 files changed, 24 insertions, 17 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 56b116eef..42a06ec2a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-13 Ettore Perazzoli <ettore@ximian.com>
+
+ [Unfix #21655.]
+
+ * camel-mime-utils.c: Revert to the old order, as the new one
+ could break mailing list names for existing users.
+
2002-03-11 Ettore Perazzoli <ettore@ximian.com>
[Fix #21655.]
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index e213014e5..47e26bf78 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3648,6 +3648,23 @@ static struct {
char *pattern;
regex_t regex;
} mail_list_magic[] = {
+ /* Sender: owner-gnome-hackers@gnome.org */
+ /* Sender: owner-gnome-hacekrs */
+ { "Sender", " *owner-([^@]+)@?([^ @\n\t\r>]*)" },
+ /* Sender: gnome-hackers-owner@gnome.org */
+ /* Sender: gnome-hackers-owner */
+ { "Sender", " *([^@]+)-owner@?([^ @\n\t\r>]*)" },
+ /* Sender: owner-gnome-hackers@gnome.org */
+ /* Sender: <owner-gnome-hackers@gnome.org> */
+ /* Sender: owner-gnome-hackers */
+ /* Sender: <owner-gnome-hackers> */
+ { "Return-Path", " <?owner-([^@>]+)@?([^ \n\t\r>]*)" },
+ /* X-BeenThere: gnome-hackers@gnome.org */
+ /* X-BeenThere: gnome-hackers */
+ { "X-BeenThere", " *([^@]+)@?([^ \n\t\r>]*)" },
+ /* Delivered-To: mailing list gnome-hackers@gnome.org */
+ /* Delivered-To: mailing list gnome-hackers */
+ { "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r>]*)" },
/* X-Mailing-List: <gnome-hackers@gnome.org> arcive/latest/100 */
/* X-Mailing-List: gnome-hackers@gnome.org */
/* X-Mailing-List: gnome-hackers */
@@ -3670,23 +3687,6 @@ static struct {
/* X-List: gnome-hackers */
/* X-List: gnome-hackers@gnome.org */
{ "X-List", " *([^@]+)@?([^ \n\t\r>]*)" },
- /* Sender: owner-gnome-hackers@gnome.org */
- /* Sender: owner-gnome-hacekrs */
- { "Sender", " *owner-([^@]+)@?([^ @\n\t\r>]*)" },
- /* Sender: gnome-hackers-owner@gnome.org */
- /* Sender: gnome-hackers-owner */
- { "Sender", " *([^@]+)-owner@?([^ @\n\t\r>]*)" },
- /* Delivered-To: mailing list gnome-hackers@gnome.org */
- /* Delivered-To: mailing list gnome-hackers */
- { "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r>]*)" },
- /* Sender: owner-gnome-hackers@gnome.org */
- /* Sender: <owner-gnome-hackers@gnome.org> */
- /* Sender: owner-gnome-hackers */
- /* Sender: <owner-gnome-hackers> */
- { "Return-Path", " <?owner-([^@>]+)@?([^ \n\t\r>]*)" },
- /* X-BeenThere: gnome-hackers@gnome.org */
- /* X-BeenThere: gnome-hackers */
- { "X-BeenThere", " *([^@]+)@?([^ \n\t\r>]*)" },
};
char *