diff options
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 6 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 16 |
3 files changed, 19 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 439eb34874..16e0c6d522 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2001-01-25 Not Zed <NotZed@Ximian.com> + + * backend/pas/pas-backend-ldap.c: esexp api change fixes. + + * backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes. + (vcard_matches_search): esexp api fixes. + (pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object). + 2001-01-24 Chris Toshok <toshok@ximian.com> * backend/pas/pas-backend-ldap.c (email_ber_func): make sure to diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 4b54541df3..b4a0555e76 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -358,7 +358,7 @@ entry_compare(PASBackendFileSearchContext *ctx, struct _ESExp *f, } } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = truth; return r; @@ -462,7 +462,7 @@ vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string) gtk_object_unref(GTK_OBJECT(view->search_context->card)); - e_sexp_result_free(r); + e_sexp_result_free(view->search_sexp, r); return retval; } @@ -483,7 +483,7 @@ pas_backend_file_search (PASBackendFile *bf, return; if (view->search_sexp) - gtk_object_unref(GTK_OBJECT(view->search_sexp)); + e_sexp_unref(view->search_sexp); view->search_sexp = e_sexp_new(); for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) { diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 6d7c9f5f8f..585715986b 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -1070,7 +1070,7 @@ func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data) g_free (strings); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1105,7 +1105,7 @@ func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data) g_free (strings); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1124,7 +1124,7 @@ func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data) g_free (term); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1196,7 +1196,7 @@ func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data } } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1221,7 +1221,7 @@ func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data) ldap_attr, str)); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1251,7 +1251,7 @@ func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *da str)); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1281,7 +1281,7 @@ func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data str)); } - r = e_sexp_result_new(ESEXP_RES_BOOL); + r = e_sexp_result_new(f, ESEXP_RES_BOOL); r->value.bool = FALSE; return r; @@ -1329,8 +1329,8 @@ pas_backend_ldap_build_query (gchar *query) r = e_sexp_eval(sexp); + e_sexp_result_free(sexp, r); e_sexp_unref (sexp); - e_sexp_result_free(r); if (list->next) { g_warning ("conversion to ldap query string failed"); |