|
|
@ -1,14 +1,14 @@
|
|
|
|
diff -up evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c
|
|
|
|
diff -up evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c
|
|
|
|
--- evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query 2008-06-15 23:18:08.000000000 -0400
|
|
|
|
--- evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c.fix-ldap-query 2008-06-15 23:18:08.000000000 -0400
|
|
|
|
+++ evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c 2008-06-16 10:34:29.000000000 -0400
|
|
|
|
+++ evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-ldap.c 2008-06-16 10:34:29.000000000 -0400
|
|
|
|
@@ -3417,22 +3417,28 @@ func_and(struct _ESExp *f, int argc, str
|
|
|
|
@@ -3417,22 +3417,28 @@ func_and(struct _ESExp *f, gint argc, str
|
|
|
|
char ** strings;
|
|
|
|
gchar ** strings;
|
|
|
|
|
|
|
|
|
|
|
|
if (argc > 0) {
|
|
|
|
if (argc > 0) {
|
|
|
|
- int i;
|
|
|
|
- gint i;
|
|
|
|
+ int i, empty;
|
|
|
|
+ gint i, empty;
|
|
|
|
|
|
|
|
|
|
|
|
strings = g_new0(char*, argc+3);
|
|
|
|
strings = g_new0(gchar *, argc+3);
|
|
|
|
strings[0] = g_strdup ("(&");
|
|
|
|
strings[0] = g_strdup ("(&");
|
|
|
|
strings[argc+3 - 2] = g_strdup (")");
|
|
|
|
strings[argc+3 - 2] = g_strdup (")");
|
|
|
|
|
|
|
|
|
|
|
@ -32,14 +32,14 @@ diff -up evolution-data-server-2.23.4/addressbook/backends/ldap/e-book-backend-l
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < argc + 2; i ++)
|
|
|
|
for (i = 0; i < argc + 2; i ++)
|
|
|
|
g_free (strings[i]);
|
|
|
|
g_free (strings[i]);
|
|
|
|
@@ -3454,22 +3460,28 @@ func_or(struct _ESExp *f, int argc, stru
|
|
|
|
@@ -3454,22 +3460,28 @@ func_or(struct _ESExp *f, gint argc, stru
|
|
|
|
char ** strings;
|
|
|
|
gchar ** strings;
|
|
|
|
|
|
|
|
|
|
|
|
if (argc > 0) {
|
|
|
|
if (argc > 0) {
|
|
|
|
- int i;
|
|
|
|
- gint i;
|
|
|
|
+ int i, empty;
|
|
|
|
+ gint i, empty;
|
|
|
|
|
|
|
|
|
|
|
|
strings = g_new0(char*, argc+3);
|
|
|
|
strings = g_new0(gchar *, argc+3);
|
|
|
|
strings[0] = g_strdup ("(|");
|
|
|
|
strings[0] = g_strdup ("(|");
|
|
|
|
strings[argc+3 - 2] = g_strdup (")");
|
|
|
|
strings[argc+3 - 2] = g_strdup (")");
|
|
|
|
|
|
|
|
|
|
|
|