diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-08-12 04:41:33 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-08-12 04:41:33 +0800 |
| commit | 194d3d6894709503d31d6746bfe887143eea9e57 (patch) | |
| tree | 31dddfefcebae634105c37f69bdb77a3b3c13d29 /camel/camel-folder-search.c | |
| parent | c3397634d2813c298e15e67726da303e3bff23b5 (diff) | |
| download | gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar.gz gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar.bz2 gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar.lz gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar.xz gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.tar.zst gsoc2013-evolution-194d3d6894709503d31d6746bfe887143eea9e57.zip | |
force connect manually so basics work.
2003-08-11 Not Zed <NotZed@Ximian.com>
* providers/imapp/camel-imapp-store.c (imap_get_folder_info):
force connect manually so basics work.
** See bug #45505.
* camel-service.c (camel_gethostbyname): duh, pthread_create
returns the error code directly, not via errno.
(camel_gethostbyaddr): Same, also properly handle the failure
case.
2003-08-01 Not Zed <NotZed@Ximian.com>
** See bug #47208.
* camel-filter-search.c (match_all): match-all with no arguments
should always return TRUE.
* camel-folder-search.c (camel_folder_search_execute_expression):
print a warning when we get an invalid result type & fixed a leak
for that case.
svn path=/trunk/; revision=22179
Diffstat (limited to 'camel/camel-folder-search.c')
| -rw-r--r-- | camel/camel-folder-search.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c index f19ec19aa3..89fb8f1db0 100644 --- a/camel/camel-folder-search.c +++ b/camel/camel-folder-search.c @@ -361,8 +361,7 @@ camel_folder_search_execute_expression(CamelFolderSearch *search, const char *ex matches = g_ptr_array_new(); /* now create a folder summary to return?? */ - if (r - && r->type == ESEXP_RES_ARRAY_PTR) { + if (r->type == ESEXP_RES_ARRAY_PTR) { d(printf("got result ...\n")); /* we use a mempool to store the strings, packed in tight as possible, and freed together */ /* because the strings are often short (like <8 bytes long), we would be wasting appx 50% @@ -390,15 +389,16 @@ camel_folder_search_execute_expression(CamelFolderSearch *search, const char *ex g_ptr_array_add(matches, e_mempool_strdup(pool, g_ptr_array_index(r->value.ptrarray, i))); } } - e_sexp_result_free(search->sexp, r); /* instead of putting the mempool_hash in the structure, we keep the api clean by putting a reference to it in a hashtable. Lets us do some debugging and catch unfree'd results as well. */ g_hash_table_insert(p->mempool_hash, matches, pool); } else { - d(printf("no result!\n")); + g_warning("Search returned an invalid result type"); } + e_sexp_result_free(search->sexp, r); + search->folder = NULL; search->summary = NULL; search->current = NULL; |