Allow && and || in composites.

diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c
index d1a5df4e9dca9337975f1c47ef4e1a6002a2c43d..07253a2bc5c6eaa396f3fdcabb408ecea81bae4c 100644 (file)
--- a/src/libmime/expressions.c
+++ b/src/libmime/expressions.c
@@ -256,7 +256,13 @@ op_to_char (gchar *a, gchar **next)
        case '|':
        case '(':
        case ')':
-               *next = a + 1;
+               if ((a[0] == '&' && a[1] == '&') ||
+                               (a[0] == '|' && a[1] == '|')) {
+                       *next = a + 2;
+               }
+               else {
+                       *next = a + 1;
+               }
                return *a;
        case 'O':
        case 'o':